summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-06-22 19:22:17 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-06-22 19:22:17 +0100
commit6b382cace1d5d345c2fe59308e3768fe5b0a5c03 (patch)
treef1b4db7eb0a2eb2cbed7e255f2cb23998729659a
parent0ab98103901f53c5623e056c8b894156bce241f8 (diff)
downloadtelepathy-gabble-6b382cace1d5d345c2fe59308e3768fe5b0a5c03.tar.gz
Update Wocky and prepare version 0.9.14telepathy-gabble-0.9.14
-rw-r--r--NEWS6
-rw-r--r--configure.ac4
m---------lib/ext/wocky0
3 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index d710e2298..24bb85afd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-telepathy-gabble 0.9.14 (UNRELEASED)
+telepathy-gabble 0.9.14 (2010-06-22)
====================================
+The "missing frame" release.
+
Enhancements:
• When a call is ended, mention who ended it in the debug log (wjt)
@@ -15,6 +17,8 @@ Fixes:
roster regression tests, in preparation for future ContactList API (smcv)
• Update Wocky snapshot:
+ • fd.o #28643: stop applying GNUTLS_VERIFY_DO_NOT_ALLOW_SAME flag, allowing
+ connection to (for instance) jabber.ccc.de (Lars Noschinski)
• Apply more workarounds for TLS server misbehaviour (wjt)
• fd.o #28647: be more tolerant if servers send an IQ reply without a
'from' attribute (smcv)
diff --git a/configure.ac b/configure.ac
index e9afc8d35..dad9b845d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@ AC_PREREQ([2.59])
m4_define([gabble_major_version], [0])
m4_define([gabble_minor_version], [9])
-m4_define([gabble_micro_version], [13])
-m4_define([gabble_nano_version], [1])
+m4_define([gabble_micro_version], [14])
+m4_define([gabble_nano_version], [0])
# Some magic
m4_define([gabble_base_version],
diff --git a/lib/ext/wocky b/lib/ext/wocky
-Subproject 87ceeac46a1db5e2e3f4a4a04e3fb9a52ffca4e
+Subproject e41093fb12ccc84078507aaf84d215ddb2cb163