summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-08-13 00:28:58 -0400
committerLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-08-13 00:30:25 -0400
commit959805f14d7f2f0b8f2604672b0b4b96c14d65d2 (patch)
tree672102eec0b68172245d8b8c526b17da76e63f0a
parent1e4957b4cc85613f0b2c720f20227022015912bb (diff)
-rw-r--r--NEWS7
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 5a3984d..0d8ae43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,16 @@
-telepathy-butterfly-0.5.13 (UNRELEASED)
+telepathy-butterfly-0.5.13 (2010-08-12)
=======================================
Enhancements:
+ * Video-conference support has been re-enabled
+ * Multiple Points of Presence support
+
Fixes:
* fd.o#29004: im channel: InitialInviteeIDs is an as, not s.
+ * fd.o#29015: failed to cancel incoming FT
+ * fd.o#28462: failed to connect through proxy
Dependencies:
diff --git a/configure.ac b/configure.ac
index 8dbbf84..d3e5fd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
AC_PREREQ(2.59c)
dnl If not 1, append datestamp to the version number
-m4_define(telepathy_butterfly_released, 0)
+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, 12)
+m4_define(telepathy_butterfly_micro_version, 13)
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]))