]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8aaf794 3d5a728)
Merge branch 'master' into debian-master-kalle
authorGerfried Fuchs <rhonda@debian.at>
Tue, 9 Nov 2010 19:45:44 +0000 (20:45 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Tue, 9 Nov 2010 19:45:44 +0000 (20:45 +0100)
1  2 
templates/config.tmpl patch | diff1 | diff2 | blob | history
templates/config/mirrors.tmpl patch | diff1 | diff2 | blob | history

diff --cc templates/config.tmpl
Simple merge
diff --cc templates/config/mirrors.tmpl
Simple merge