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

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