]> git.sesse.net Git - vlc/commit
Merge branch '1.0-bugfix'
authorRémi Duraffort <ivoire@videolan.org>
Wed, 20 May 2009 19:53:35 +0000 (21:53 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Wed, 20 May 2009 19:53:35 +0000 (21:53 +0200)
commit78d87996ccb92d1dc91c9987685f976ed3be08a6
treecd45fa276d4bdfd18472b858f61c0ded8413fbef
parenta4bcd514cc7ff4079d0e82ab32cacd3a9744b363
parentb36b614a1469679d21ec24e2f89b95bb89358251
Merge branch '1.0-bugfix'

Conflicts:

src/control/media_player.c
src/control/media_player.c