From: Mark Andrews <marka@isc.org>
Date: Thu, 27 Feb 2014 02:21:27 +0000 (+1100)
Subject: merge copyrights
X-Git-Tag: v9.10.0b2~93
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=95c3a5e116c1da135f669c3f15398172fac6279d;p=thirdparty%2Fbind9.git

merge copyrights
---

diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index b9237561916..b6dbdb19502 100644
--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/copyrights b/util/copyrights
index e258160c4de..87bfc5d4dd5 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -357,12 +357,11 @@
 ./bin/python/dnssec-checkds.8			MAN	2012,2013
 ./bin/python/dnssec-checkds.docbook		SGML	2012,2013
 ./bin/python/dnssec-checkds.html		HTML	DOCBOOK
-./bin/python/dnssec-checkds.py.in		PYTHON	2012,2013
+./bin/python/dnssec-checkds.py.in		PYTHON	2012,2013,2014
 ./bin/python/dnssec-coverage.8			MAN	2013,2014
 ./bin/python/dnssec-coverage.docbook		SGML	2013,2014
 ./bin/python/dnssec-coverage.html		HTML	2013,2014
 ./bin/python/dnssec-coverage.py.in		PYTHON	2013,2014
-./bin/python/win32.py				PYTHON	2013
 ./bin/rndc/.gitignore				X	2012
 ./bin/rndc/Makefile.in				MAKE	2000,2001,2002,2004,2007,2009,2012,2014
 ./bin/rndc/include/rndc/os.h			C	2001,2004,2005,2007,2009
@@ -885,6 +884,7 @@
 ./bin/tests/system/checkconf/tests.sh		SH	2005,2007,2010,2011,2012,2013,2014
 ./bin/tests/system/checkconf/warn-keydir.conf	CONF-C	2013
 ./bin/tests/system/checkds/clean.sh		SH	2012,2013
+./bin/tests/system/checkds/dig.pl		PERL	2014
 ./bin/tests/system/checkds/dig.sh		SH	2012,2013
 ./bin/tests/system/checkds/missing.example.dlv.example.dlv.db	X	2012
 ./bin/tests/system/checkds/missing.example.dnskey.db	X	2012
@@ -946,6 +946,12 @@
 ./bin/tests/system/coverage/07-ksk-ttl/expect	X	2013
 ./bin/tests/system/coverage/08-zsk-ttl/README	X	2013
 ./bin/tests/system/coverage/08-zsk-ttl/expect	X	2013
+./bin/tests/system/coverage/09-check-zsk/README	X	2014
+./bin/tests/system/coverage/09-check-zsk/expect	X	2014
+./bin/tests/system/coverage/10-check-ksk/README	X	2014
+./bin/tests/system/coverage/10-check-ksk/expect	X	2014
+./bin/tests/system/coverage/11-cutoff/README	X	2014
+./bin/tests/system/coverage/11-cutoff/expect	X	2014
 ./bin/tests/system/coverage/clean.sh		SH	2013,2014
 ./bin/tests/system/coverage/prereq.sh		SH	2014
 ./bin/tests/system/coverage/setup.sh		SH	2013,2014