]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e66c687 c82c758)
Merge commit 'c82c758c851618e8bd68b858c432151f63ba6e0f' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Wed, 17 Oct 2007 22:14:53 +0000 (22:14 +0000)
committerFrank Lichtenheld <frank@lichtenheld.de>
Wed, 17 Oct 2007 22:14:53 +0000 (22:14 +0000)
1  2 
conf/apache.conf.sed.in patch | diff1 | diff2 | blob | history
lib/Packages/Dispatcher.pm patch | diff1 | diff2 | blob | history

diff --cc conf/apache.conf.sed.in
Simple merge
diff --cc lib/Packages/Dispatcher.pm
Simple merge