]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' into lpcm_encoder
authorSteinar Gunderson <sgunderson@bigfoot.com>
Sat, 25 Sep 2010 22:46:10 +0000 (00:46 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Sat, 25 Sep 2010 22:46:10 +0000 (00:46 +0200)

Trivial merge