Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7460d0f..09dbeeb 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+
 2012-06-17  Chong Yidong  <cyd@gnu.org>
 
        * emacs.texi: Remove urlcolor setting.  Update ISBN and edition number.