]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk (r12858).
authorAlex Rousskov <rousskov@measurement-factory.com>
Tue, 28 May 2013 14:31:59 +0000 (08:31 -0600)
committerAlex Rousskov <rousskov@measurement-factory.com>
Tue, 28 May 2013 14:31:59 +0000 (08:31 -0600)
1  2 
src/SquidConfig.h
src/cache_cf.cc
src/cf.data.pre

Simple merge
diff --cc src/cache_cf.cc
Simple merge
diff --cc src/cf.data.pre
Simple merge