]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5511c78 3a31a33)
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 12 Jan 2010 06:35:50 +0000 (19:35 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 12 Jan 2010 06:35:50 +0000 (19:35 +1300)
1  2 
configure.in patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Mirror of https://github.com/squid-cache/squid.git