From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 17 Jul 2012 17:00:00 +0000 (-0400)
Subject: 2.33.6
X-Git-Tag: 2.33.6~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e97a4c7e5ef205dea08928f64ee5ba7e222e3b9b;p=platform%2Fupstream%2Fglib.git

2.33.6

https://bugzilla.gnome.org/show_bug.cgi?id=680111
---

diff --git a/NEWS b/NEWS
index aeeafa0..27b9de1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of changes from GLib 2.33.4 to 2.33.6
+==============================================
+
+* GAsyncInitable: partially revert the init_finish changes,
+  some applications were found to rely on behaviour that
+  was broken by these changes
+
+* Bugs fixed:
+ 679617 win32: fix g_get_environ()
+ 679968 Add some annotations to GBytes, GVariantType...
+
+* Translation updates:
+ Spanish
+
 Overview of changes from GLib 2.33.3 to 2.33.4
 ==============================================
 
diff --git a/configure.ac b/configure.ac
index 9d367ae..2e29b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [33])
-m4_define([glib_micro_version], [5])
+m4_define([glib_micro_version], [6])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])