[Emacs-diffs] /srv/bzr/emacs/trunk r104532: Move ChangeLog entry to the right file.

[Glenn Morris]

------------------------------------------------------------
revno: 104532
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-06-07 23:51:26 -0700
message:
  Move ChangeLog entry to the right file.
modified:
  ChangeLog
  doc/misc/ChangeLog

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-06-07 04:16:37 +0000
+++ b/ChangeLog 2011-06-08 06:51:26 +0000
@@ -26,7 +26,7 @@
 
 2011-05-27  Paul Eggert  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-05-31 22:08:51 +0000
+++ b/doc/misc/ChangeLog        2011-06-08 06:51:26 +0000
@@ -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  <address@hidden>
+
+       * texinfo.tex: Merge from gnulib.
+
 2011-05-18  Teodor Zlatanov  <address@hidden>
 
        * gnus.texi (Gnus Registry Setup): Rename from "Setup".