Merge branch 'master' of git@git.videolan.org:vlc
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:32:09 +0000 (22:32 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:32:09 +0000 (22:32 +0300)
commit3eeab0d3a064349bbd0f65b9a890a3cfc82f6283
treeb249b51a6a40468f4fc18e00b6b738b08cd36884
parent7079b91c24f7c8032025576407f1386350cae58f
parent4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b
Merge branch 'master' of git@git.videolan.org:vlc