[vlc-devel] commit: Fix conflicts. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 26 01:16:47 2009 +0200| [13a41fa0f38f3932bc9ee721709cf20cc270ce6d] | committer: Jean-Baptiste Kempf 

Fix conflicts.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13a41fa0f38f3932bc9ee721709cf20cc270ce6d
---

 .../Resources/English.lproj/VLM.nib/classes.nib    |   72 ++++++++
 .../Resources/English.lproj/VLM.nib/info.nib       |   19 ++
 .../English.lproj/VLM.nib/keyedobjects.nib         |  Bin 0 -> 23284 bytes
 modules/gui/macosx/Modules.am                      |    2 +
 modules/gui/macosx/intf.h                          |    4 +
 modules/gui/macosx/intf.m                          |   15 ++
 modules/gui/macosx/misc.m                          |   10 +-
 modules/gui/macosx/simple_prefs.m                  |    7 +-
 modules/gui/macosx/vlm.h                           |  115 ++++++++++++
 modules/gui/macosx/vlm.m                           |  184 ++++++++++++++++++++
 projects/mozilla/vlcshell.cpp                      |   24 ---
 11 files changed, 415 insertions(+), 37 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=13a41fa0f38f3932bc9ee721709cf20cc270ce6d