summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2014-03-24 14:53:42 -0400
committerRyan Lortie <desrt@desrt.ca>2014-03-24 14:53:42 -0400
commit3f8f040349ae821854bccb2c3535a58b0ee66803 (patch)
tree1d93c041a0b56867fb8e72b8b10e6e0a145ed195
parent187af7ba1d77750878133956fb86fa7b82c1530f (diff)
downloadglib-baserock/2.40.0.tar.gz
-rw-r--r--NEWS14
-rw-r--r--configure.ac4
2 files changed, 16 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index a5a86e55e..621214593 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of changes from GLib 2.39.92 to GLib 2.40.0
+====================================================
+
+There have been no code changes since the release candidate, but there
+have been the following other changes:
+
+ * Disable IPv6 testcases on machines without IPv6
+ * Document that it is a bad idea to match on generic error codes
+
+Translations updated:
+ * Danish
+ * Punjabi
+ * Serbian
+
Overview of changes from GLib 2.39.91 to GLib 2.39.92
=====================================================
diff --git a/configure.ac b/configure.ac
index 3f70cf8ca..a01e58da8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,8 @@ m4_define(glib_configure_ac)
# <mclasen> on the unstable (ie master), interface age = 0
m4_define([glib_major_version], [2])
-m4_define([glib_minor_version], [39])
-m4_define([glib_micro_version], [92])
+m4_define([glib_minor_version], [40])
+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)])