Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b27377baa4a4eec31212983dde85314c6d1edb1c..4a1e95a6ee2d6b09418887f60dc6ad66af4c6495 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-06  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac: Handle info/ files with or without ".info" extension.
+
 2012-11-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib for 'inline' (Bug#13040), incorporating: