Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Paul Saman <jpsaman@videolan.org>
Mon, 14 Apr 2008 13:44:31 +0000 (15:44 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Mon, 14 Apr 2008 13:44:31 +0000 (15:44 +0200)
commitdf61d33b06e2b3cbbe746b2f5a9bea5b370c24ff
treec5e7a5079a136f68965689f908f9146bb84cb98e
parentcb23a8236a23ff3b112dc74871e894ac2b8291f3
parent0311983688a416d34978718f73687c5b6121480c
Merge branch 'master' of git@git.videolan.org:vlc