merge copyrights

diff --git a/util/copyrights b/util/copyrights
index 481ae0c7044b0c90eb73247c86e97b36ed564c12..d183095cf8956b124875e428d2848c4d20507f20 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -293,11 +293,11 @@
 ./bin/named/win32/dlz_dlopen_driver.c          C       2011,2012,2013,2014
 ./bin/named/win32/include/named/ntservice.h    C       1999,2000,2001,2002,2003,2004,2007
 ./bin/named/win32/include/named/os.h           C       1999,2000,2001,2002,2004,2007,2008,2009,2014
-./bin/named/win32/named.dsp.in                 X       2001,2004,2005,2008,2009,2010,2011,2013,2014
+./bin/named/win32/named.dsp.in                 X       2001,2004,2005,2008,2009,2010,2011,2013,2014,2015
 ./bin/named/win32/named.dsw                    X       2001
-./bin/named/win32/named.mak.in                 X       2001,2002,2004,2005,2006,2008,2009,2010,2011,2013,2014
+./bin/named/win32/named.mak.in                 X       2001,2002,2004,2005,2006,2008,2009,2010,2011,2013,2014,2015
 ./bin/named/win32/named.vcxproj.filters.in     X       2013
-./bin/named/win32/named.vcxproj.in             X       2013,2014
+./bin/named/win32/named.vcxproj.in             X       2013,2014,2015
 ./bin/named/win32/named.vcxproj.user           X       2013
 ./bin/named/win32/ntservice.c                  C       1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014
 ./bin/named/win32/os.c                         C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015
@@ -3774,6 +3774,7 @@
 ./lib/isc/win32/ipv6.c                         C       1999,2000,2001,2004,2007
 ./lib/isc/win32/keyboard.c                     C       2000,2001,2004,2007
 ./lib/isc/win32/libgen.h                       C       2009
+./lib/isc/win32/libisc.def.exclude             X       2015
 ./lib/isc/win32/libisc.def.in                  X       2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/isc/win32/libisc.dsp.in                  X       2001,2002,2003,2004,2005,2006,2007,2008,2009,2013,2014
 ./lib/isc/win32/libisc.dsw                     X       2001