]> git.sesse.net Git - vlc/commit
Merge branch 'master' into lpcm_encoder lpcm_encoder
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Sun, 3 Oct 2010 12:58:06 +0000 (14:58 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Sun, 3 Oct 2010 12:58:06 +0000 (14:58 +0200)
commitfe2fb5d35cfb033bbd1b3f2b588de34653677c2c
tree0634190138e537a0258e7090b7b70f04e0813dad
parent5a2f258ce8cd94f83fd6f0808be2154272e632f3
parentd09772f846f9250d7a1f04e58a48be8a76d8ece3
Merge branch 'master' into lpcm_encoder