summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-17 08:51:19 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-17 08:51:19 +0200
commit7f64bc9ef6dce174f258da8cb106228d11e7d16c (patch)
tree92411979af309268fd8490fe425c3b00825ebc71
parentf1e9435ad656137507a624f065439c349fcb200c (diff)
parent7c60cb8249f5eb975969d09c4ec23f4afb69e309 (diff)
Merge branch 'telepathy-glib-0.14'
-rw-r--r--NEWS6
-rw-r--r--configure.ac4
2 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 4bf45c8e..691bd37f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,14 @@
-telepathy-glib 0.14.6 (UNRELEASED yo)
+telepathy-glib 0.14.6 (2011-05-16)
==================================
Fixes:
• tp_dbus_daemon_watch_name_owner leaked a DBusMessage (fledermaus)
• tp_dbus_daemon_list[_activatable]_names leaked a DBusMessage (fledermaus)
+• tp_base_connection_change_status: delay side-effects until all
+ preconditions are checked (Simon)
+• TpGroupMixin: correctly use contact-ids, not member-ids (Will)
+• TpBaseContactList: fix leak of source object (Mike)
telepathy-glib 0.14.5 (2011-04-20)
==================================
diff --git a/configure.ac b/configure.ac
index 568fd9bb..8c266efd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PREREQ([2.59])
m4_define([tp_glib_major_version], [0])
m4_define([tp_glib_minor_version], [14])
-m4_define([tp_glib_micro_version], [999])
+m4_define([tp_glib_micro_version], [6])
m4_define([tp_glib_nano_version], [1])
# If library source has changed since last release, increment revision
@@ -27,7 +27,7 @@ m4_define([tp_glib_nano_version], [1])
# never seen in a release).
m4_define([tp_glib_lt_current], [56])
-m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_revision], [1])
m4_define([tp_glib_lt_age], [56])
# Some magic