git.ipfire.org Git - thirdparty/squid.git/commit - src/Transients.cc

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

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d620ae0 4e3f4dc)

author	Christos Tsantilas <chtsanti@users.sourceforge.net>
	Fri, 2 May 2014 08:34:46 +0000 (11:34 +0300)
committer	Christos Tsantilas <chtsanti@users.sourceforge.net>
	Fri, 2 May 2014 08:34:46 +0000 (11:34 +0300)
commit	31855516f574fe5bea7e2f9b33147adbaf854c5a
tree	271387d300d971bc2e159c8a06128fe8060782e9	tree \| snapshot
parent	d620ae0e088b9dd97704a66e67f88d8f02d8e509	commit \| diff
parent	4e3f4dc76d5d21fdc0a17c7f04b6e86ca3d1a382	commit \| diff

merge from trunk

14 files changed:

configure.ac	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
src/client_side_request.h	diff1 \|	diff2 \|	blob \| history
src/ssl/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/ssl/PeerConnector.cc	\|	diff2 \|	blob \| history
src/ssl/PeerConnector.h	\|	diff2 \|	blob \| history
src/ssl/ServerBump.cc	diff1 \|	diff2 \|	blob \| history
src/ssl/ServerBump.h	diff1 \|	diff2 \|	blob \| history
src/ssl/bio.cc	diff1 \|	\|	blob \| history
src/ssl/support.cc	diff1 \|	diff2 \|	blob \| history
src/ssl/support.h	diff1 \|	diff2 \|	blob \| history

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