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: 4228b17 3d979d0)

author	Amos Jeffries <squid3@treenet.co.nz>
	Thu, 3 Jun 2010 07:18:25 +0000 (19:18 +1200)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Thu, 3 Jun 2010 07:18:25 +0000 (19:18 +1200)
commit	1d827652d0e5346cac7365bf1ddbb7863d142047
tree	65d118e47f31b7139f86490bfbcd950386c99d62	tree \| snapshot
parent	4228b17a43ffb027940c2f950965d1574d1d52b5	commit \| diff
parent	3d979d0584586c0d073a6874f08961d7dc9b4fb5	commit \| diff

Merge from trunk

12 files changed:

src/HttpRequest.cc	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/client_side.h	diff1 \|	diff2 \|	blob \| history
src/fqdncache.cc	diff1 \|	diff2 \|	blob \| history
src/http.cc	diff1 \|	diff2 \|	blob \| history
src/ipcache.cc	diff1 \|	diff2 \|	blob \| history
src/main.cc	diff1 \|	diff2 \|	blob \| history
src/protos.h	diff1 \|	diff2 \|	blob \| history
src/structs.h	diff1 \|	diff2 \|	blob \| history
src/typedefs.h	diff1 \|	diff2 \|	blob \| history

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