From 3c64200f68e3ab67e2f64b99041882b9d741ca7c Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 27 Sep 2010 11:41:31 -0400
Subject: release 2.26.0

---
 NEWS         | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index bb445838a..b5244c499 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,51 @@
+Overview of Changes from GLib 2.25.17 to GLib 2.26.0
+====================================================
+
+GSettings:
+ - allow override files to have entries for non-existent schemas
+ - schema compiler no longer aborts due to an error in a single .xml
+   file
+
+GDBus:
+ - fix some race conditions in the connection test cases
+
+GDateTime:
+ - hide some implementation details (time zones)
+ - fix parameter naming in header file to match .c file
+ - add G_GNUC_WARN_UNUSED_RESULT for modifier functions
+ - add full ISO 8601 week date support and improve docs
+
+Other:
+ - g_quark_try_string(NULL) now returns 0 without error
+ - clean up confusing code in GSocketControlMessage
+ - fix SOCKS5 memory leak
+ - improve some docs
+
+Bugs closed:
+ 628937 gracefully handle broken schemas
+ 629687 leaks class refcount in gsocketcontrolmessage
+ 630000 g_date_time_difference
+ 630077 GDateTime week number support
+ 630185 Allow NULL strings in g_quark_try_string() 
+
+Translations updated:
+ Basque
+ Brazilian Portuguese
+ Bulgarian
+ Czech
+ Danish
+ Dutch
+ Estonian
+ French
+ Greek
+ Hebrew
+ Japanese
+ Korean
+ Romanian
+ Russian
+ Spanish
+ Traditional Chinese
+
 Overview of Changes from GLib 2.25.16 to GLib 2.25.17
 =====================================================
 
diff --git a/configure.ac b/configure.ac
index 8f65df790..ea73394a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,8 @@ m4_define(glib_configure_ac)
 # set glib_binary_age _and_ glib_interface_age to 0.
 #
 m4_define([glib_major_version], [2])
-m4_define([glib_minor_version], [25])
-m4_define([glib_micro_version], [18])
+m4_define([glib_minor_version], [26])
+m4_define([glib_micro_version], [0])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
-- 
cgit v1.2.3