aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-06-07 23:51:26 -0700
committerGlenn Morris2011-06-07 23:51:26 -0700
commite61923c8f764e8d3d1665b48e61bbe64a60b8457 (patch)
tree05a0357cd2264d56dc54f7f0f1f36366be9fc9bb
parentf3d1777e719dce79af5b78950deeff9e30ce00b0 (diff)
downloademacs-e61923c8f764e8d3d1665b48e61bbe64a60b8457.tar.gz
emacs-e61923c8f764e8d3d1665b48e61bbe64a60b8457.zip
Move ChangeLog entry to the right file.
-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 @@
26 26
272011-05-27 Paul Eggert <eggert@cs.ucla.edu> 272011-05-27 Paul Eggert <eggert@cs.ucla.edu>
28 28
29 * doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib. 29 * lib/getopt.c, lib/intprops.h: Merge from gnulib.
30 30
312011-05-24 Glenn Morris <rgm@gnu.org> 312011-05-24 Glenn Morris <rgm@gnu.org>
32 32
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 @@
4 `gnus-registry-article-marks-to-{chars,names}' instead of 4 `gnus-registry-article-marks-to-{chars,names}' instead of
5 `gnus-registry-user-format-function-{M,M2}'. 5 `gnus-registry-user-format-function-{M,M2}'.
6 6
72011-05-27 Paul Eggert <eggert@cs.ucla.edu>
8
9 * texinfo.tex: Merge from gnulib.
10
72011-05-18 Teodor Zlatanov <tzz@lifelogs.com> 112011-05-18 Teodor Zlatanov <tzz@lifelogs.com>
8 12
9 * gnus.texi (Gnus Registry Setup): Rename from "Setup". 13 * gnus.texi (Gnus Registry Setup): Rename from "Setup".