Merge from trunk.

1 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 94b4be02106..b9301731d5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume freestanding C89 headers, string.h, stdlib.h.
         Again, this simplifies the code, and all current platforms have these.
@@ -13,6 +13,10 @@
         can add the gnulib modules for these (a 1-line change to Makefile.in).
         * configure.in: Don't check for memcmp, memcpy, memmove, memset.
 
+2011-07-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26.
+
 2011-07-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin