git.ipfire.org Git - thirdparty/squid.git/commit - src/wordlist.h

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

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f968813 c486d50)

author	Amos Jeffries <squid3@treenet.co.nz>
	Wed, 5 Nov 2014 10:18:15 +0000 (02:18 -0800)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Wed, 5 Nov 2014 10:18:15 +0000 (02:18 -0800)
commit	de95413f57b25f362022b41a4df024e27393a932
tree	6d6c44d543d11a7e19b5b719f6f7457cfc6bf6d0	tree \| snapshot
parent	f96881323e8306c672c335e2fd7e1e71e9754c3f	commit \| diff
parent	c486d50a78f2fcbdeb5f8758ce116809106b7edb	commit \| diff

Merge from trunk rev.13687

16 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/HttpHeader.h	diff1 \|	diff2 \|	blob \| history
src/HttpRequest.cc	diff1 \|	diff2 \|	blob \| history
src/HttpRequest.h	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/MemObject.h	diff1 \|	diff2 \|	blob \| history
src/acl/MethodData.h	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/client_side.h	diff1 \|	diff2 \|	blob \| history
src/htcp.cc	diff1 \|	diff2 \|	blob \| history
src/mgr/ActionWriter.h	diff1 \|	diff2 \|	blob \| history
src/mgr/Filler.h	diff1 \|	diff2 \|	blob \| history
src/mime.cc	diff1 \|	diff2 \|	blob \| history
src/servers/FtpServer.cc	diff1 \|	diff2 \|	blob \| history
src/servers/FtpServer.h	diff1 \|	diff2 \|	blob \| history
src/servers/HttpServer.cc	diff1 \|	diff2 \|	blob \| history

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