]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9786e97 5933707)
Merge commit 'origin/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Sat, 21 Feb 2009 14:23:28 +0000 (15:23 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sat, 21 Feb 2009 14:23:28 +0000 (15:23 +0100)
Conflicts:
config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_m68k
lib/Packages/DoSearchContents.pm
lib/Packages/Search.pm
static/index.tmpl
templates/config/archive_layout.tmpl

1  2 
bin/parse-packages patch | diff1 | diff2 | blob | history
lib/Packages/DoShow.pm patch | diff1 | diff2 | blob | history

diff --cc bin/parse-packages
Simple merge
diff --cc lib/Packages/DoShow.pm
Simple merge