Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru

[gnu-emacs] / doc / lispintro / ChangeLog

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 6ccac447134dc5623444f338bcf1636d3f1b0b30..c76d9534b26b7cbc3ed94c8f0f592b00d47e1632 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to 24.4 release.
+
 2014-10-13  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (dist): Update for new output variables.