Merge from trunk.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a3bbe29e77e3f4eb24557bc73db51b98b1edf20c..2ca87de9570bacb65d79c48ba806c6d471ed5519 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-13  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in: Also look for tputs in libcurses.  (Bug#9736)
+
 2011-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.in: Remove check for -lintl (Bug#9713).