Merge from emacs-24; up to 117691

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9a7a6c8c8a6049f71e80c430cc26582f88049465..83a842372a0b7400779112f6e20c7a9761a84b7a 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-09  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (version): Remove variable.
+       (clean): No longer delete dist tarfile.
+       (dist): Remove rule; replace with code in admin.el.
+
 2014-11-07  Martin Rudalics  <rudalics@gmx.at>
 
        * frames.texi (Size and Position): Rewrite description of