]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
merged fron trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 14 Jan 2012 07:42:56 +0000 (00:42 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 14 Jan 2012 07:42:56 +0000 (00:42 -0700)
1  2 
compat/xalloc.cc
include/util.h

Simple merge
diff --cc include/util.h
Simple merge