]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da9934d c21f9fb)
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)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.