Merge from gnulib.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d6d75963de269c16e00c5cba782f7dd843accc53..7a0e4874d8f8e831119bc2bc7a3f1b12560e9220 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2012-08-02 stat-time, timespec, u64: support naive out-of-dir builds
+
 2012-08-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * lib/Makefile.am (DEFAULT_INCLUDES): Add -I$(top_srcdir)/lib for