[master] copyrights

diff --git a/util/copyrights b/util/copyrights
index d52571c0580b7343f2fbab0c556cd99f71350e0b..996599e8e2dffa5c2bfc2d09ced63d08a93b32ba 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1453,9 +1453,10 @@
 ./bin/tests/system/geoip/ns2/named7.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named8.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named9.conf       CONF-C  2013
+./bin/tests/system/geoip/options.conf          CONF-C  2015
 ./bin/tests/system/geoip/prereq.sh             SH      2013,2014
 ./bin/tests/system/geoip/setup.sh              SH      2013,2014
-./bin/tests/system/geoip/tests.sh              SH      2013,2014
+./bin/tests/system/geoip/tests.sh              SH      2013,2014,2015
 ./bin/tests/system/glue/clean.sh               SH      2000,2001,2004,2007,2012,2014,2015
 ./bin/tests/system/glue/fi.good                        X       2000,2001
 ./bin/tests/system/glue/noglue.good            X       2000,2001
@@ -4066,7 +4067,7 @@
 ./lib/isccc/win32/libisccc.vcxproj.user                X       2013
 ./lib/isccc/win32/version.c                    C       2001,2004,2007
 ./lib/isccfg/Makefile.in                       MAKE    2001,2002,2003,2004,2005,2007,2009,2011,2012,2013,2014,2015
-./lib/isccfg/aclconf.c                         C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+./lib/isccfg/aclconf.c                         C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/isccfg/api                               X       2001,2006,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/isccfg/dnsconf.c                         C       2009
 ./lib/isccfg/include/Makefile.in               MAKE    2001,2004,2007,2012