Merge from gnulib, incorporating:

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 82b4e7f..872cf56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       * doc/misc/texinfo.tex: Update to 2012-07-29.17 version.
+
 2012-07-29  Jan Djärv  <jan.h.d@swipnet.se>
 
        * Makefile.in (install-arch-indep): Handle space in locallisppath.