summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-25 16:14:41 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-25 16:14:41 +0100
commit89758d18706ea62fe7c339dd922ef170c7fe4843 (patch)
tree872384381e6afa98844084e22b02ae63b06d0f58
parent4e7736243b5b6ceb999e7e9347ea74dac0abad28 (diff)
Prepare stable release 0.10.6
-rw-r--r--NEWS4
-rw-r--r--configure.ac6
2 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 3f3e113c..6e27bb2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-telepathy-glib 0.10.6 (UNRELEASED)
+telepathy-glib 0.10.6 (2010-05-25)
==================================
+The "needs the heavy metal umlaut" release.
+
Fixes:
* TpGroupMixin: allow "adding" contacts who are already members, even if the
diff --git a/configure.ac b/configure.ac
index a91087b1..896fe694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,14 +11,14 @@ AC_PREREQ([2.59])
m4_define([tp_glib_major_version], [0])
m4_define([tp_glib_minor_version], [10])
-m4_define([tp_glib_micro_version], [5])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [6])
+m4_define([tp_glib_nano_version], [0])
# If library source has changed since last release, increment revision.
# Do not add new API or ABI, or make incompatible changes, on this branch
# (which means that current and age should remain 32).
m4_define([tp_glib_lt_current], [32])
-m4_define([tp_glib_lt_revision], [6])
+m4_define([tp_glib_lt_revision], [7])
m4_define([tp_glib_lt_age], [32])
# Some magic