]> git.sesse.net Git - vlc/commit
projects / vlc / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66bd920) | patch
Fix conflicts.
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 May 2009 23:16:47 +0000 (01:16 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 May 2009 23:16:47 +0000 (01:16 +0200)
commit13a41fa0f38f3932bc9ee721709cf20cc270ce6d
treeed75ce28f6526aaab22c46b005c615efa335fa4atree | snapshot
parent66bd92014e5d721d8fe74bfd69f601bfd228012acommit | diff
Fix conflicts.
extras/package/macosx/Resources/English.lproj/VLM.nib/classes.nib [new file with mode: 0644] blob
extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib [new file with mode: 0644] blob
extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib [new file with mode: 0644] blob
modules/gui/macosx/Modules.am diff | blob | history
modules/gui/macosx/intf.h diff | blob | history
modules/gui/macosx/intf.m diff | blob | history
modules/gui/macosx/misc.m diff | blob | history
modules/gui/macosx/simple_prefs.m diff | blob | history
modules/gui/macosx/vlm.h [new file with mode: 0644] blob
modules/gui/macosx/vlm.m [new file with mode: 0644] blob
projects/mozilla/vlcshell.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.