]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' into lpcm_encoder
authorSteinar Gunderson <sgunderson@bigfoot.com>
Sun, 26 Sep 2010 16:22:14 +0000 (18:22 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Sun, 26 Sep 2010 16:22:14 +0000 (18:22 +0200)

Trivial merge