Merge branch '1.0'
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 May 2009 22:51:06 +0000 (00:51 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 May 2009 22:51:06 +0000 (00:51 +0200)
commit66bd92014e5d721d8fe74bfd69f601bfd228012a
tree5eba3056d9ed093d57913acf43034b1d5c1296c7
parent1319c5c570074abacf35a18d82326ff447c60d03
parentf02742c79fc5843a84d7ae241a8970cea3d98a67
Merge branch '1.0'

Conflicts:
extras/contrib/Makefile
extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
extras/package/macosx/vlc.xcodeproj/project.pbxproj
modules/gui/qt4/dialogs/external.cpp
projects/mozilla/vlcshell.cpp
src/control/event.c
src/control/media_list_player.c
src/control/media_player.c
extras/package/macosx/vlc.xcodeproj/project.pbxproj
modules/gui/macosx/Modules.am
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m
src/modules/modules.c