]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82c671b 2b844aa)
Merge commit 'alioth/master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 3 Oct 2008 10:29:20 +0000 (12:29 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 3 Oct 2008 10:29:20 +0000 (12:29 +0200)
1  2 
config.sh.sed.in patch | diff1 | diff2 | blob | history
templates/config.tmpl patch | diff1 | diff2 | blob | history

diff --cc config.sh.sed.in
Simple merge
diff --cc templates/config.tmpl
Simple merge