Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Paul Saman <jpsaman@videolan.org>
Wed, 28 May 2008 16:12:49 +0000 (18:12 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Wed, 28 May 2008 16:12:49 +0000 (18:12 +0200)
commit975a356c965b7f84586b929b14ea8a70c6535beb
tree6245e1e0f599dda15e0703fc2aeed91d36c4fbda
parentb4fdd335a492ae0254f0eb4b50aa46f01cfddd6b
parente41bccdf8818640a8a03241c1a36613995a779fc
Merge branch 'master' of git@git.videolan.org:vlc