summaryrefslogtreecommitdiff
path: root/admin/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 55504b3d6f8..86069da7f0b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Make merging from gnulib a script, not a makefile action.
+ * merge-gnulib: New script, with actions moved here from
+ ../Makefile.in.
+
2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
* CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.