git.ipfire.org Git - thirdparty/squid.git/commit

]> git.ipfire.org Git - thirdparty/squid.git/commit

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1689cdb 02e1ed2)

author	Amos Jeffries <squid3@treenet.co.nz>
	Tue, 12 Aug 2014 15:57:20 +0000 (08:57 -0700)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Tue, 12 Aug 2014 15:57:20 +0000 (08:57 -0700)
commit	a07a354fd0c528b6ce429fd39fdf2f8ae1283f17
tree	80e986f595cde332460892caa341c0df671cf647	tree \| snapshot
parent	1689cdbc1355cd1281cd3bdc791c1b13cec462fe	commit \| diff
parent	02e1ed26125b25f3009636ea077bf876409a2052	commit \| diff

Merge from trunk rev.13532

doc/release-notes/release-3.5.sgml	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/SquidConfig.h	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/client_side.h	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/squid-cache/squid.git