]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b675bdf 4144ee2)
Merge branch 'master' into ubuntu-master
authorGerfried Fuchs <rhonda@debian.at>
Wed, 7 Jul 2010 12:29:37 +0000 (14:29 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 7 Jul 2010 12:29:37 +0000 (14:29 +0200)
1  2 
templates/config/mirrors.tmpl patch | diff1 | diff2 | blob | history
templates/html/show.tmpl patch | diff1 | diff2 | blob | history

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