Merge branch 'master' of git@git.videolan.org:vlc
commitdff434365d951b38be69859dc8c3b210c82e019f
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Fri, 11 Apr 2008 08:53:45 +0000 (11 10:53 +0200)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Fri, 11 Apr 2008 08:53:45 +0000 (11 10:53 +0200)
treefc25b1a20743c1336e8337cbe0961de98846d33a
parentc72f2f9dcdcdb330488f01317758086f612b3044
parent87db766dfd95376030367483c6f9fbd2286de167
Merge branch 'master' of git@git.videolan.org:vlc