------------------------------------------------------------
revno: 13304
revision-id: squid3@treenet.co.nz-20140306054117-6srghm970jhwi9ao
parent: squid3@treenet.co.nz-20140306035541-dwvelv1ibhmwdpxb
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Thu 2014-03-06 18:41:17 +1300
message:
  Copyright: Remove explicit claims on src/ by Treehouse Networks Ltd.
  
  Amos Jeffries is listed as author in CONTRIBUTORS and Treehouse Networks
  Ltd. listed in SPONSORS and commit messages.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140306054117-6srghm970jhwi9ao
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 1c6d0d8e119a5969eede3ec0dbd16109d1b17467
# timestamp: 2014-03-06 05:55:41 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140306035541-\
#   dwvelv1ibhmwdpxb
# 
# Begin patch
=== modified file 'CREDITS'
--- CREDITS	2014-03-06 03:55:41 +0000
+++ CREDITS	2014-03-06 05:41:17 +0000
@@ -475,9 +475,7 @@
 
 ==============================================================================
 
-include/IPAddress.h lib/IPAddress.cc:
 include/rfc3596.h lib/rfc3596.cc:
-src/ICMPv6.h src/ICMPv6.cc:
 
  This code is copyright (C) 2007-2009 by Treehouse Networks Ltd
  of New Zealand. It is published and Licensed as an extension of

=== modified file 'src/icmp/IcmpConfig.h'
--- src/icmp/IcmpConfig.h	2012-09-01 14:38:36 +0000
+++ src/icmp/IcmpConfig.h	2014-03-06 05:41:17 +0000
@@ -1,36 +1,5 @@
 /*
  * DEBUG: section 03    Configuration Settings
- * AUTHOR: Amos Jeffries
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from the
- *  Internet community.  Development is led by Duane Wessels of the
- *  National Laboratory for Applied Network Research and funded by the
- *  National Science Foundation.  Squid is Copyrighted (C) 1998 by
- *  the Regents of the University of California.  Please see the
- *  COPYRIGHT file for full details.  Squid incorporates software
- *  developed and/or copyrighted by other sources.  Please see the
- *  CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- *  This code is copyright (C) 2007 by Treehouse Networks Ltd
- *  of New Zealand. It is published and Lisenced as an extension of
- *  squid under the same conditions as the main squid application.
  */
 #ifndef ICMPCONFIG_H
 #define ICMPCONFIG_H

=== modified file 'src/ip/Address.cc'
--- src/ip/Address.cc	2014-02-21 10:46:19 +0000
+++ src/ip/Address.cc	2014-03-06 05:41:17 +0000
@@ -1,7 +1,5 @@
 /*
  * DEBUG: section 14    IP Storage and Handling
- * AUTHOR: Amos Jeffries
- * COPYRIGHT: GPL version 2, (C)2007-2013 Treehouse Networks Ltd.
  */
 #include "squid.h"
 #include "compat/getaddrinfo.h"

=== modified file 'src/ip/Address.h'
--- src/ip/Address.h	2014-02-21 10:46:19 +0000
+++ src/ip/Address.h	2014-03-06 05:41:17 +0000
@@ -1,7 +1,5 @@
 /*
  * DEBUG: section 14    IP Storage and Handling
- * AUTHOR: Amos Jeffries
- * COPYRIGHT: GPL version 2, (C)2007-2013 Treehouse Networks Ltd.
  */
 #ifndef _SQUID_SRC_IP_ADDRESS_H
 #define _SQUID_SRC_IP_ADDRESS_H