Merge branch 'master' of git@git.videolan.org:vlc
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 15 Apr 2009 20:27:33 +0000 (23:27 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 15 Apr 2009 20:27:33 +0000 (23:27 +0300)
commit6511df53b2ea6320b5cf36a539ea6cffa99dffb9
tree88a9c4e40f1bbbfb2db627096f46b96600fbaa16
parent665ba714270b60aef0af2029d2eae6acb86ef7ff
parente5030121893c5a7db7e910c4da09d9f3c8171947
Merge branch 'master' of git@git.videolan.org:vlc