summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2009-01-11 04:32:12 +0000
committerRoland McGrath <roland@gnu.org>2009-01-11 04:32:12 +0000
commit8be96dd183a5e70b3924f5e85da05591238014be (patch)
treee677a345ad554e6d7314052ce6b3c00fb677683d
parent251fe50c6df60f1432e94fea00be88b77b8ec3c4 (diff)
* nscd/nscd.c (parse_opt): Use argp_error for bad -i argument.
>>>>>>> 1.11443
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2652b66a25..19427d8f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-10 Roland McGrath <roland@redhat.com>
+
+ * nscd/nscd.c (parse_opt): Use argp_error for bad -i argument.
+
2009-01-08 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/fpu/libm-test-ulps: Adjust expm1 errors.
@@ -56,6 +60,7 @@
* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Check and
adjust the buffer alignment.
+>>>>>>> 1.11443
2009-01-07 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/Makefile (sysdep_headers) [subdir=socket]: