]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e7cefd c6ceebd)
Merge commit 'origin/master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 17 Feb 2008 21:22:49 +0000 (22:22 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 17 Feb 2008 21:22:49 +0000 (22:22 +0100)
Conflicts:

static/index.tmpl

1  2 
static/index.tmpl patch | diff1 | diff2 | blob | history

diff --cc static/index.tmpl
Simple merge