]> git.sesse.net Git - vlc/commitdiff
Merge branch 1.0-bugfix
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 13 May 2009 15:52:30 +0000 (18:52 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 13 May 2009 15:52:37 +0000 (18:52 +0300)
1  2 
src/control/media_player.c

Simple merge