]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' into lpcm_encoder
authorSteinar Gunderson <sgunderson@bigfoot.com>
Mon, 27 Sep 2010 21:36:38 +0000 (23:36 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Mon, 27 Sep 2010 21:36:38 +0000 (23:36 +0200)

Trivial merge