Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b1be1416a770cb1696bb4589018078da363cd2d8..23e1d0dff76ae02087ca26ef3b87098313889ee8 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-13  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (dist): Update for new output variables.
+
 2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        * macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics)