git.deb.at Git - deb/packages.git/commit

]> git.deb.at Git - deb/packages.git/commit

projects / deb / packages.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 643c0d6 cfd9016)

author	Frank Lichtenheld <frank@lichtenheld.de>
	Wed, 12 Sep 2007 20:51:18 +0000 (22:51 +0200)
committer	Frank Lichtenheld <frank@lichtenheld.de>
	Wed, 12 Sep 2007 20:51:18 +0000 (22:51 +0200)
commit	2ba8772e72ef20f2486e86194c5862212a99ccbf
tree	73f1c418f9145e51894d78cef29ead85c8513208	tree \| snapshot
parent	643c0d669ad783d14919ee7b7644ee4f05e7c0bf	commit \| diff
parent	cfd901631e57f7184e96c132817cbb4de0fd7929	commit \| diff

Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master

Conflicts:

conf/apache.conf.sed.in
config.sh.sed.in
lib/Packages/Search.pm

conf/apache.conf.sed.in	diff1 \|	diff2 \|	blob \| history
config.sh.sed.in	diff1 \|	diff2 \|	blob \| history
lib/Packages/Search.pm	diff1 \|	diff2 \|	blob \| history
templates/html/foot.tmpl	diff1 \|	diff2 \|	blob \| history
templates/html/head.tmpl	diff1 \|	diff2 \|	blob \| history