]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7ef451 7def3be)
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 25 Feb 2016 16:49:08 +0000 (17:49 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 25 Feb 2016 16:49:08 +0000 (17:49 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/globals.h patch | diff1 | diff2 | blob | history

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