]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6fa38f 810a542)
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 18 Dec 2013 18:06:43 +0000 (19:06 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 18 Dec 2013 18:06:43 +0000 (19:06 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

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