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

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 91eb430..d111394 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,21 @@
+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.
+
+2013-06-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8
+       as a fallback.
+
 2013-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * .bzrignore: Don't unignore cl-loaddefs.el.
 
-2013-06-20  Rüdiger Sonderfeld <ruediger@c-plusplus.de>
+2013-06-20  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * configure.ac (log2): Check for this function.