]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7ad4af e758499)
Merged from trunk merge-candidate-3-v1
authorFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 4 Aug 2015 11:09:58 +0000 (13:09 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 4 Aug 2015 11:09:58 +0000 (13:09 +0200)
1  2 
src/http/Makefile.am patch | diff1 | diff2 | blob | history

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