* lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 55d89f537f49cbd496d0b05476c52461290c29cc..c6531ffba3f0530e2ba7430afa125aaa5a0454d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib.
+
+2011-06-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3.
+
+2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/gnulib.mk, m4/gnulib-common.m4: Merge from gnulib.
+
 2011-06-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.in: Add --with-wide-int.
@@ -26,7 +38,7 @@
 
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
+       * lib/getopt.c, lib/intprops.h: Merge from gnulib.
 
 2011-05-24  Glenn Morris  <rgm@gnu.org>