upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://repo/proj/git/prod/bind9

Browse source
This commit is contained in:
Evan Hunt 2012-09-26 17:22:30 -07:00
commit a55235344a
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/private/SRCID
View file

@ -1,4 +1,4 @@
# This file must follow /bin/sh rules. It is imported directly via
# configure.
#
SRCID="( 2012/09/26 06:15:00 UTC )"
SRCID="( 2012/09/27 00:15:00 UTC )"

2
lib/isc/include/isc/timer.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/isc/timer_api.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2009, 2012 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

2
lib/isc/unix/include/isc/time.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/isc/win32/include/isc/time.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2006-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2006-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/isc/win32/time.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2006-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2006-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

10
util/copyrights
View file

@ -2683,7 +2683,7 @@
./lib/isc/include/isc/symtab.h C 1996,1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2011,2012
./lib/isc/include/isc/task.h C 1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012
./lib/isc/include/isc/taskpool.h C 1999,2000,2001,2004,2005,2006,2007,2011,2012
./lib/isc/include/isc/timer.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009
./lib/isc/include/isc/timer.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012
./lib/isc/include/isc/types.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012
./lib/isc/include/isc/util.h C 1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012
./lib/isc/include/isc/version.h C 2001,2004,2005,2006,2007
@ -2777,7 +2777,7 @@
./lib/isc/tests/task_test.c C 2011,2012
./lib/isc/tests/taskpool_test.c C 2011,2012
./lib/isc/timer.c C 1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012
./lib/isc/timer_api.c C 2009
./lib/isc/timer_api.c C 2009,2012
./lib/isc/timer_p.h C 2000,2001,2004,2005,2007,2009
./lib/isc/unix/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2009,2012
./lib/isc/unix/app.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009
@ -2802,7 +2802,7 @@
./lib/isc/unix/include/isc/stdtime.h C 1999,2000,2001,2004,2005,2007,2011,2012
./lib/isc/unix/include/isc/strerror.h C 2001,2004,2005,2007,2008
./lib/isc/unix/include/isc/syslog.h C 1999,2000,2001,2004,2005,2007
./lib/isc/unix/include/isc/time.h C 1998,1999,2000,2001,2004,2005,2006,2007,2008,2009
./lib/isc/unix/include/isc/time.h C 1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012
./lib/isc/unix/interfaceiter.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008
./lib/isc/unix/ipv6.c C 1999,2000,2001,2004,2005,2006,2007
./lib/isc/unix/keyboard.c C 2000,2001,2004,2007
@ -2849,7 +2849,7 @@
./lib/isc/win32/include/isc/strerror.h C 2001,2004,2007
./lib/isc/win32/include/isc/syslog.h C 1999,2000,2001,2004,2007
./lib/isc/win32/include/isc/thread.h C 1998,1999,2000,2001,2004,2005,2007,2009
./lib/isc/win32/include/isc/time.h C 1998,1999,2000,2001,2004,2006,2007,2008,2009
./lib/isc/win32/include/isc/time.h C 1998,1999,2000,2001,2004,2006,2007,2008,2009,2012
./lib/isc/win32/include/isc/win32os.h C 2002,2004,2007,2009
./lib/isc/win32/interfaceiter.c C 1999,2000,2001,2004,2007,2008,2009
./lib/isc/win32/ipv6.c C 1999,2000,2001,2004,2007
@ -2873,7 +2873,7 @@
./lib/isc/win32/syslog.c C 2001,2002,2003,2004,2007
./lib/isc/win32/syslog.h C 2001,2002,2004,2007
./lib/isc/win32/thread.c C 1998,1999,2000,2001,2004,2005,2007
./lib/isc/win32/time.c C 1998,1999,2000,2001,2003,2004,2006,2007,2008,2009
./lib/isc/win32/time.c C 1998,1999,2000,2001,2003,2004,2006,2007,2008,2009,2012
./lib/isc/win32/unistd.h C 2000,2001,2004,2007,2008,2009
./lib/isc/win32/version.c C 1998,1999,2000,2001,2004,2007
./lib/isc/win32/win32os.c C 2002,2004,2007