------------------------------------------------------------
revno: 13704
revision-id: squid3@treenet.co.nz-20141220183604-i419hcj5n5p6b7ww
parent: squidadm@squid-cache.org-20141220181400-nrj9zw3polup2l1u
author: Source Maintenance <squidadm@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sat 2014-12-20 10:36:04 -0800
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141220183604-i419hcj5n5p6b7ww
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 98bbf0ed116b6e0aa7d55ded1c089e3b88a6c62f
# timestamp: 2014-12-20 18:38:45 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squidadm@squid-cache.org-20141220181400-\
#   nrj9zw3polup2l1u
# 
# Begin patch
=== modified file 'doc/manuals/language.list'
--- doc/manuals/language.list	2014-10-30 14:44:26 +0000
+++ doc/manuals/language.list	2014-12-20 18:36:04 +0000
@@ -5,6 +5,7 @@
 ## contributions from numerous individuals and organizations.
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
+
 TRANSLATE_LANGUAGES= \
     ar.lang \
     cs.lang \

=== modified file 'errors/language.list'
--- errors/language.list	2014-10-30 14:44:26 +0000
+++ errors/language.list	2014-12-20 18:36:04 +0000
@@ -5,6 +5,7 @@
 ## contributions from numerous individuals and organizations.
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
+
 TRANSLATE_LANGUAGES= \
     af.lang \
     ar.lang \

=== modified file 'errors/template.list'
--- errors/template.list	2014-10-30 14:44:26 +0000
+++ errors/template.list	2014-12-20 18:36:04 +0000
@@ -5,6 +5,7 @@
 ## contributions from numerous individuals and organizations.
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
+
 ERROR_TEMPLATES= \
     templates/ERR_ACCESS_DENIED \
     templates/ERR_ACL_TIME_QUOTA_EXCEEDED \

=== modified file 'icons/icon.list'
--- icons/icon.list	2014-10-30 14:44:26 +0000
+++ icons/icon.list	2014-12-20 18:36:04 +0000
@@ -5,6 +5,7 @@
 ## contributions from numerous individuals and organizations.
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
+
 ICONS= \
     silk/application.png \
     silk/arrow_up.png \

=== modified file 'lib/profiler/xprof_type.h'
--- lib/profiler/xprof_type.h	2014-12-20 18:14:00 +0000
+++ lib/profiler/xprof_type.h	2014-12-20 18:36:04 +0000
@@ -5,6 +5,7 @@
  * contributions from numerous individuals and organizations.
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
+
 #ifndef _PROFILER_XPROF_TYPE_H_
 #define _PROFILER_XPROF_TYPE_H_
 /* AUTO-GENERATED FILE */

=== modified file 'src/tests/Stub.list'
--- src/tests/Stub.list	2014-10-30 14:44:26 +0000
+++ src/tests/Stub.list	2014-12-20 18:36:04 +0000
@@ -5,6 +5,7 @@
 ## contributions from numerous individuals and organizations.
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
+
 STUB_SOURCE= tests/STUB.h \
 	tests/stub_access_log.cc \
 	tests/stub_acl.cc \