------------------------------------------------------------ revno: 11812 revision-id: squid3@treenet.co.nz-20130427142201-u6j99ltbbyvu5rdu parent: squid3@treenet.co.nz-20130427030700-ut3rwatli9swkj2c committer: Amos Jeffries <squid3@treenet.co.nz> branch nick: 3.2 timestamp: Sat 2013-04-27 08:22:01 -0600 message: Revert r11810 - tools.h does not exist in 3.2 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130427142201-u6j99ltbbyvu5rdu # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 3cec36d74c9bc3a939e10f4ed0aa174e82a64cfb # timestamp: 2013-04-27 14:53:18 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20130427030700-\ # ut3rwatli9swkj2c # # Begin patch === modified file 'src/ip/Intercept.cc' --- src/ip/Intercept.cc 2013-04-27 02:36:33 +0000 +++ src/ip/Intercept.cc 2013-04-27 14:22:01 +0000 @@ -34,7 +34,6 @@ #include "comm/Connection.h" #include "ip/Intercept.h" #include "fde.h" -#include "src/tools.h" #if IPF_TRANSPARENT