Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 755de78..c28ff68 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+       * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
+
+2014-03-22  Glenn Morris  <rgm@gnu.org>
+
+       * quick-install-emacs (AVOID): Remove testfile and test-distrib.
+
 2014-03-21  Glenn Morris  <rgm@gnu.org>
 
        * update_autogen: Auto-detect VCS in use.