summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-17 11:55:28 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-17 11:55:28 +0100
commit2487d4f72c00fbac6fa2f9e32e4e72404e24ae96 (patch)
tree29327cc4074bd0a1d02379f5005ee001339aa010
parent7494959b21e00acfc853728a230cb9dd55e46df5 (diff)
parent7c43fdc26f561018c3ba66314974d5db45081415 (diff)
downloadtelepathy-glib-2487d4f72c00fbac6fa2f9e32e4e72404e24ae96.tar.gz
Merge remote-tracking branch 'origin/telepathy-glib-0.24'
-rw-r--r--NEWS8
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 75d9ca0cf..b4ae41bb1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
-telepathy-glib 0.24.1 (UNRELEASED)
+telepathy-glib 0.24.1 (2014-08-25)
==================================
-...
+Fixes:
+
+• base-client: fix potential uninitialized variable bug (Guillaume)
+• Fix a potential crash in contact-list example (fd.o #79006, Guillaume)
+
telepathy-glib 0.24.0 (2014-03-26)
==================================
diff --git a/configure.ac b/configure.ac
index 5c07d4143..e3b2bb698 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PREREQ([2.60])
m4_define([tp_glib_major_version], [0])
m4_define([tp_glib_minor_version], [24])
-m4_define([tp_glib_micro_version], [0])
+m4_define([tp_glib_micro_version], [1])
m4_define([tp_glib_nano_version], [1])
# If library source has changed since last release, increment revision