]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9083dcf 13bd5c1)
Merge commit 'origin/master' into archive-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Wed, 29 Oct 2008 11:22:17 +0000 (12:22 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Wed, 29 Oct 2008 11:22:17 +0000 (12:22 +0100)
Conflicts:

config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_volatile
static/index.tmpl

1  2 
cron.d/120synctrans patch | diff1 | diff2 | blob | history
lib/Packages/Dispatcher.pm patch | diff1 | diff2 | blob | history

diff --cc cron.d/120synctrans
Simple merge
diff --cc lib/Packages/Dispatcher.pm
Simple merge