]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76ea5b8 c47edfa)
Merge branch 'debian-master' of ssh://source.djpig.de/srv/source.djpig.de/git/package...
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 24 Oct 2008 18:42:23 +0000 (18:42 +0000)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 24 Oct 2008 18:42:23 +0000 (18:42 +0000)
1  2 
conf/apache.conf.sed.in patch | diff1 | diff2 | blob | history
config.sh.sed.in patch | diff1 | diff2 | blob | history

diff --cc conf/apache.conf.sed.in
Simple merge
diff --cc config.sh.sed.in
Simple merge