]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 626d109 6841797)
Merge branch '0.9.0-libass' of git://git.videolan.org/vlc
authorDerk-Jan Hartman <hartman@videolan.org>
Sat, 9 Aug 2008 00:07:55 +0000 (02:07 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Sat, 9 Aug 2008 00:07:55 +0000 (02:07 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
extras/contrib/src/Makefile patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc extras/contrib/src/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.