]> git.sesse.net Git - vlc/commit
Merge branch 1.0-bugfix into master
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 23 May 2009 14:01:32 +0000 (17:01 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 23 May 2009 14:01:32 +0000 (17:01 +0300)
commit152b1687c0ec112f3ab1360006d048d6b9cf7258
treef4d50e9baf6327e011b3380f05e65e51392b60a5
parent4d4f701e03e4b861f38249f001bec0ba7d286de1
parent0577234ca3dbfe9a3d9ea5eb82d533bedf88469c
Merge branch 1.0-bugfix into master

Conflicts:
modules/video_output/drawable.c
src/control/libvlc_internal.h
modules/codec/fluidsynth.c
modules/video_output/xcb/x11.c
modules/video_output/xcb/xvideo.c
src/control/libvlc_internal.h
src/control/media_list_player.c