Require pkg-config 0.26 or later in autogen.sh only.

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index af0a15b..7af23b7 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * notes/bzr: Update instructions for merging from gnulib.
+       Remove obsolete note about tramp.el and tramp-sh.el.
+       Change "emacs-23" to "emacs-24".
+
+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.