]> git.sesse.net Git - vlc/commit
Merge branch 'master' into lpcm_encoder
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 23:18:38 +0000 (01:18 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 23:18:38 +0000 (01:18 +0200)
commite50a251c828bfc7ce98813959abc49e1ce0580fe
treec2d89afbb946441ec0a1b6255a3c14c7ba4d9563
parent999535678a808b26f24495a949ff3dd92094ee2a
parentaf5b42b7d02e8a20ad0e9fe02b42bfe59c4c07f6
Merge branch 'master' into lpcm_encoder

Conflicts:
NEWS
NEWS