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: 7803fd5 fa77ba5)

author	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 13 Aug 2010 04:42:26 +0000 (16:42 +1200)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 13 Aug 2010 04:42:26 +0000 (16:42 +1200)
commit	d74ef7169637941a6d7bca6cd08bbf56ab107637
tree	5859fcf93782655dc60088780977d253fa0a61eb	tree
parent	7803fd54336397e85194223fccca80f1a764fbd7	commit \| diff
parent	fa77ba50a926cb4ea968f758b54510fa3e2f4bfc	commit \| diff

Merge from trunk

12 files changed:

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_request.cc	diff1 \|	diff2 \|	blob \| history
src/comm/ListenStateData.cc	diff1 \|	diff2 \|	blob \| history
src/comm/ListenStateData.h	diff1 \|	diff2 \|	blob \| history
src/dns_internal.cc	diff1 \|	diff2 \|	blob \| history
src/forward.cc	diff1 \|	diff2 \|	blob \| history
src/http.cc	diff1 \|	diff2 \|	blob \| history
src/icp_v2.cc	diff1 \|	diff2 \|	blob \| history
src/structs.h	diff1 \|	diff2 \|	blob \| history
src/wccp2.cc	diff1 \|	diff2 \|	blob \| history

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