summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-08 03:00:52 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-08 03:00:52 -0700
commit4a621aae149e694c8a53bebcc593d51811f69444 (patch)
tree98f8469d3d5a2daff773ca7431f93c59061dc440 /ChangeLog
parent354cf0ba0b20108c9776be1d868458893bc2cd54 (diff)
downloademacs-4a621aae149e694c8a53bebcc593d51811f69444.tar.gz
* lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: 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 19dcf6818e3..128d3283030 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-05 Jan Djärv <jan.h.d@swipnet.se>
* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.