Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Baptiste Kempf <jb@videolan.org>
Wed, 25 Jun 2008 19:49:51 +0000 (12:49 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 25 Jun 2008 19:49:51 +0000 (12:49 -0700)
commit84e0f97a07c049c9c7082032699d54f9b4e5708a
tree6346614011804618130737198a04d742b676395f
parent2f53d49924d2806ae17b28ec09163fa2e8668c3d
parent12b188309df1e63cd65c7988c97d78aa857e21aa
Merge branch 'master' of git@git.videolan.org:vlc