Merge from emacs-24; up to 117691

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 9470c93326499b79b84152d99e68ff26459fb4cb..303da8c020a455e8a2b3a82df01ca316daf8847a 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-09  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (make-manuals-dist-output-variables)
+       (make-manuals-dist--1, make-manuals-dist): New.
+       Replaces doc/*/Makefile.in `dist' rules.
+
 2014-11-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Spelling fixes; tweak explanation of commit messages.