summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-08 03:02:24 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-08 03:02:24 -0700
commit2287ac9896c30303d7f469a3e5cb348fbbbd9e23 (patch)
treee2d382dce109ee7a9b51a5cd4f0d0e2641bb6540 /ChangeLog
parenta63e0781250f31d99360209d9053d380d6fe0815 (diff)
parent4a621aae149e694c8a53bebcc593d51811f69444 (diff)
downloademacs-2287ac9896c30303d7f469a3e5cb348fbbbd9e23.tar.gz
Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 217e1d30ff5..d04d7e2e279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-08 Paul Eggert <eggert@cs.ucla.edu>
+
+ * lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.
+
2011-07-07 Andreas Schwab <schwab@linux-m68k.org>
* configure.in (maintainer-mode): Reflect default in help string.