]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git://git.videolan.org/vlc
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 21:55:39 +0000 (23:55 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 21:55:39 +0000 (23:55 +0200)
1  2 
NEWS

diff --cc NEWS
Simple merge