]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu...
authorFrank Lichtenheld <frank@lichtenheld.de>
Wed, 6 Feb 2008 16:29:37 +0000 (17:29 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Wed, 6 Feb 2008 16:30:03 +0000 (17:30 +0100)
commitd73f83ba4ee2e4bfaee23913fc1e4cae2c4aaea8
treeacea7ea909fb0f4936b874c67141d27ef3ca44cc
parentd5e622d42460518dc365802aac38cbec778f824d
parentca605dba77e7901e6b99a59fe8d8a9de776614b7
Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master

Conflicts:

config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_amd64
cron.d/100syncarchive_backports
cron.d/100syncarchive_m68k
cron.d/100syncarchive_maintainers
cron.d/100syncarchive_volatile
cron.d/700install_static
static/debian.css
static/index.tmpl
static/packages.css.sed.in
templates/config.tmpl
templates/config/mirrors.tmpl
templates/html/download.tmpl
templates/html/show.tmpl
12 files changed:
conf/apache.conf.sed.in
config.sh.sed.in
cron.d/100syncarchive
lib/Packages/DoSearchContents.pm
lib/Packages/Search.pm
setup-site.conf
static/debian.css
static/packages.css.sed.in
templates/config.tmpl
templates/html/download.tmpl
templates/html/head.tmpl
templates/html/show.tmpl