summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-06-08 15:33:04 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-06-08 15:53:17 +0100
commit3a496cb5594927a85f0774965b0442a071110973 (patch)
tree2ea1a58a25b0b3b60d79ade4dec1ea1e22aaed62
parent67d700f310a869fc16d7b793ae75727cd24e68ce (diff)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--NEWS15
-rw-r--r--configure.ac2
2 files changed, 16 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 365cadf..f3b1dbb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+telepathy-butterfly-0.5.11 (2010-06-08)
+=======================================
+
+Fixes:
+
+ * fd.o#28354: make sure the correct type gets returned when getting
+ PendingMessages.
+
+ * Don't always remove pending messages when ListPendingMessages is
+ called.
+
+ * Don't assume "message-type" is set on calls to SendMessage.
+
+ * Replace \r\n with \n in incoming messages.
+
telepathy-butterfly-0.5.10 (2010-05-20)
=======================================
diff --git a/configure.ac b/configure.ac
index b5d37a0..d7affa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ m4_define(telepathy_butterfly_released, 1)
dnl The telepathy-python version number (must actually be numeric at the moment)
m4_define(telepathy_butterfly_major_version, 0)
m4_define(telepathy_butterfly_minor_version, 5)
-m4_define(telepathy_butterfly_micro_version, 10)
+m4_define(telepathy_butterfly_micro_version, 11)
m4_define(telepathy_butterfly_maybe_datestamp,
m4_esyscmd([if test x]telepathy_butterfly_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))