aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--resolv/nss_dns/dns-host.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61ec1e16d0..dca8ed9808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-31 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * resolv/nss_dns/dns-host.c: Merge copyright years.
+
2012-03-22 Liubov Dmitrieva <liubov.dmitrieva@gmail.com>
* sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Update.
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index ba83c440cc..a924d40844 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2004, 2007-2010, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.