Merge branch 'master' of git@git.videolan.org:vlc
authorSam Hocevar <sam@zoy.org>
Thu, 20 Mar 2008 17:38:00 +0000 (17:38 +0000)
committerSam Hocevar <sam@zoy.org>
Thu, 20 Mar 2008 17:38:00 +0000 (17:38 +0000)
commit4e0e4d6d4a3421ccf21715b0705b582826b0d62e
tree4a01f513a5895ff0f3030863131af1be2f5a7256
parentcfc98288babeb803bbeb85198fbad529cb35b659
parent3b0534ea2cd006b38292a28b32a685e6e0ef10a2
Merge branch 'master' of git@git.videolan.org:vlc