Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 24 Feb 2009 10:15:50 +0000 (11:15 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 24 Feb 2009 10:15:50 +0000 (11:15 +0100)
commit4362a469b5203cc57a17d4acb9354e8d03925478
tree095ba835ed79278d620f23ad2227bd5c1cf291a0
parent10f1c32dbd8552e3cfe824aae2b861871252a09d
parent36ed9b07993314c3bc04cd6ab4076b4a7b8a2176
Merge branch 'master' of git@git.videolan.org:vlc