summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Pessi <Pekka.Pessi@nokia.com>2011-01-25 17:40:31 +0200
committerPekka Pessi <Pekka.Pessi@nokia.com>2011-01-25 17:40:31 +0200
commite8785a91dcfc651ca4dca5f2eaec0b989e2fb27a (patch)
treed2c3f508f542c5b21561d753dd1f34a4367df74f
parent1b488d53a963e41f639a84bb571123f678179583 (diff)
2.1.22.1.2
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7829e76..9bed893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+release 2.1.2
+ Fix emitting Closed and ChannelClosed signals
+ Implement Channel.Interface.SMS
+ Improved conferencing support.
+ BMC#12873: implement Telepathy Hold model properly with oFono
+
release 2.1.1
Initial conferencing support.
fd.o #32718: return InvalidHandle if calling to self or anonymous handle
diff --git a/configure.ac b/configure.ac
index fbc21f9..62651da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([telepathy-ring], [2.1.1+])
+AC_INIT([telepathy-ring], [2.1.2])
AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([foreign 1.9])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])