summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-11-25 16:08:39 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-11-25 16:08:39 +0000
commit24c9275f386f8f826fbe58ffe0a431302f1cbaa5 (patch)
tree0f29fd171bb31fdaebcea8bb1d1b6f338ae3aa23
parent54026302fdd4aab3ea8be346de4c9d165e806c2f (diff)
downloadtelepathy-glib-24c9275f386f8f826fbe58ffe0a431302f1cbaa5.tar.gz
Prepare version 0.12.5telepathy-glib-0.12.5
-rw-r--r--NEWS8
-rw-r--r--configure.ac6
2 files changed, 9 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index bab06b9b6..f08a5d926 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
-telepathy-glib 0.12.5 (UNRELEASED)
+telepathy-glib 0.12.5 (2010-11-25)
==================================
-…
+The "does firing someone out of a cannon count as canonizing them?" release.
+
+Fixes:
+
+• Use the right getter for TpAccountChannelRequest:request (smcv)
telepathy-glib 0.12.4 (2010-11-17)
==================================
diff --git a/configure.ac b/configure.ac
index d7225f142..a8a000062 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,15 +11,15 @@ AC_PREREQ([2.59])
m4_define([tp_glib_major_version], [0])
m4_define([tp_glib_minor_version], [12])
-m4_define([tp_glib_micro_version], [4])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [5])
+m4_define([tp_glib_nano_version], [0])
# If library source has changed since last release, increment revision
# If interfaces have been added, removed or changed since last release,
# you're on the wrong branch :-)
m4_define([tp_glib_lt_current], [45])
-m4_define([tp_glib_lt_revision], [3])
+m4_define([tp_glib_lt_revision], [4])
m4_define([tp_glib_lt_age], [45])
# Some magic