Merge branch 'master' of git@git.videolan.org:vlc
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 15 Feb 2009 17:26:12 +0000 (19:26 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 15 Feb 2009 17:26:12 +0000 (19:26 +0200)
commit31a51c3e45d72159defca0aaf95a5b599fc7cc5d
treebd05ced725a68a35ac5cc76f225ef240c490503f
parent1a11a808f3b9c73dff29e67a335b6308ebfb504e
parent0f594de02d5dc1b2f4efa1c3dea088a8149819d1
Merge branch 'master' of git@git.videolan.org:vlc