Merge branch 'master' of git@git.videolan.org:vlc
authorRafaël Carré <funman@videolan.org>
Sun, 23 Mar 2008 22:28:03 +0000 (22:28 +0000)
committerRafaël Carré <funman@videolan.org>
Sun, 23 Mar 2008 22:28:03 +0000 (22:28 +0000)
commitc8e6c21dc43999ad81e6801011c57553a07e85ab
tree17b40986d217d5216247c8d275690a3e520960af
parent05278162c64a1c402aa18dd5fccbd835e2a57aaf
parente5189c41aa4da2f92f4146c669e62d6eb2530fb1
Merge branch 'master' of git@git.videolan.org:vlc