]> git.sesse.net Git - vlc/commit
Merge branch 'master' into lpcm_encoder
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Thu, 30 Sep 2010 21:31:14 +0000 (23:31 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Thu, 30 Sep 2010 21:31:14 +0000 (23:31 +0200)
commit42f0232b694ea4ef13b3ffb68935bf0297c7105b
treea16e8c121979b98a8e94153e00cc4e74024bc063
parentda9934d964539b0dcbd45455b35d757e2ce4aead
parentc21f9fb09f669d1777b2a8b177c9a7068af4f147
Merge branch 'master' into lpcm_encoder