From: Glenn Morris <rgm@gnu.org>
Date: Wed, 8 Jun 2011 06:51:26 +0000 (-0700)
Subject: Move ChangeLog entry to the right file.
X-Git-Tag: emacs-pretest-24.0.90~104^2~615
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e61923c8f764e8d3d1665b48e61bbe64a60b8457;p=emacs.git

Move ChangeLog entry to the right file.
---

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".