]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc09c36 ade1b3c)
Merge branch 'master' of git://git.videolan.org/vlc
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Wed, 29 Sep 2010 18:56:56 +0000 (20:56 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Wed, 29 Sep 2010 18:56:56 +0000 (20:56 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.