From: Mark Andrews <marka@isc.org>
Date: Sun, 21 Dec 2014 00:01:37 +0000 (+1100)
Subject: merge copyrights
X-Git-Tag: v9.11.0a1~1162
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4ba21f60009e18c5950d18546a127e70be537eff;p=thirdparty%2Fbind9.git

merge copyrights
---

diff --git a/util/copyrights b/util/copyrights
index 5b0af4513d8..411ce9a7faa 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1485,7 +1485,7 @@
 ./bin/tests/system/lwresd/ns1/named.conf	CONF-C	2000,2001,2004,2006,2007,2008
 ./bin/tests/system/lwresd/ns1/root.db		ZONE	2000,2001,2004,2007
 ./bin/tests/system/lwresd/resolv.conf		CONF-SH	2000,2001,2004,2007,2012
-./bin/tests/system/lwresd/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013
+./bin/tests/system/lwresd/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014
 ./bin/tests/system/masterfile/clean.sh		SH	2001,2004,2007,2010,2012,2014
 ./bin/tests/system/masterfile/knowngood.dig.out	X	2001,2004,2012
 ./bin/tests/system/masterfile/ns1/include.db	ZONE	2001,2004,2007,2012
@@ -1789,7 +1789,8 @@
 ./bin/tests/system/runall.sh			SH	2000,2001,2004,2007,2010,2011,2012,2014
 ./bin/tests/system/runtime/README		TXT.BRIEF	2014
 ./bin/tests/system/runtime/clean.sh		SH	2014
-./bin/tests/system/runtime/ns2/named-alt.conf	CONF-C	2014
+./bin/tests/system/runtime/ns2/named-alt1.conf	CONF-C	2014
+./bin/tests/system/runtime/ns2/named-alt2.conf	CONF-C	2014
 ./bin/tests/system/runtime/ns2/named.conf	CONF-C	2014
 ./bin/tests/system/runtime/tests.sh		SH	2014
 ./bin/tests/system/send.pl			PERL	2001,2004,2007,2011,2012