------------------------------------------------------------
revno: 12299
revision-id: squidadm@squid-cache.org-20120825001313-r29kssp32bjna4i1
parent: kinkie@squid-cache.org-20120824105403-9c1zahgbualxfwuu
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Fri 2012-08-24 18:13:13 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120825001313-\
#   r29kssp32bjna4i1
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: b402f8f9fc419b16b6e405f92d74b7db9968e040
# timestamp: 2012-08-25 00:52:44 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120824105403-\
#   9c1zahgbualxfwuu
# 
# Begin patch
=== modified file 'scripts/sort-includes.pl' (properties changed: -x to +x)
=== modified file 'src/esi/Module.cc'
--- src/esi/Module.cc	2012-08-24 09:57:00 +0000
+++ src/esi/Module.cc	2012-08-25 00:13:13 +0000
@@ -4,7 +4,7 @@
 #include "esi/Libxml2Parser.h"
 /* include for esi/ExpatParser.h must follow esi/Libxml2Parser.h */
 /* do not remove this comment, as it acts as barrier for the autmatic sorting */
-#include "esi/ExpatParser.h" 
+#include "esi/ExpatParser.h"
 
 static ESIParser::Register *prCustom = 0;
 #if HAVE_LIBXML2

=== modified file 'src/tests/testDiskIO.cc'
--- src/tests/testDiskIO.cc	2012-08-24 09:57:00 +0000
+++ src/tests/testDiskIO.cc	2012-08-25 00:13:13 +0000
@@ -12,7 +12,7 @@
 #include "StoreFileSystem.h"
 #include "testStoreSupport.h"
 
-#if 0 
+#if 0
 // AYJ: COSS in Squid-3 is disabled.
 #include "fs/coss/CossSwapDir.h"
 #endif