[vlc-devel] commit: Merge branch '1.0' (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 26 00:51:06 2009 +0200| [66bd92014e5d721d8fe74bfd69f601bfd228012a] | committer: Jean-Baptiste Kempf 

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

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