summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--doc/misc/ChangeLog4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 55d89f537f4..983abda6fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@
2011-05-27 Paul Eggert <eggert@cs.ucla.edu>
- * doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
+ * lib/getopt.c, lib/intprops.h: Merge from gnulib.
2011-05-24 Glenn Morris <rgm@gnu.org>
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index aaf4bcae1b3..c626a8c70b8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -4,6 +4,10 @@
`gnus-registry-article-marks-to-{chars,names}' instead of
`gnus-registry-user-format-function-{M,M2}'.
+2011-05-27 Paul Eggert <eggert@cs.ucla.edu>
+
+ * texinfo.tex: Merge from gnulib.
+
2011-05-18 Teodor Zlatanov <tzz@lifelogs.com>
* gnus.texi (Gnus Registry Setup): Rename from "Setup".