Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 8588d58a103cbb93cdb9b46703f0acb759df86de..d111394a9b6fc4477ede4fc5d49f1163c320f5a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-24  Glenn Morris  <rgm@fencepost.gnu.org>
+
+       * configure.ac: Include X11/X.h when testing for Xft.h.  (Bug#14684)
+
 2013-06-22  Juanma Barranquero  <lekktu@gmail.com>
 
        * .bzrignore: Add GNU idutils ID database file.