summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Pessi <Pekka.Pessi@nokia.com>2011-01-04 21:11:30 +0200
committerPekka Pessi <Pekka.Pessi@nokia.com>2011-01-04 21:11:30 +0200
commitc31125b54130864285ca37bea92d7fe08919624c (patch)
tree47dad7e1c794c8bf55be8cf2a28e2544599c7917
parent03f9f10ff6ab00b38b4ec9e00aa31423343e33d7 (diff)
Release 2.1.12.1.1
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b12505..7829e76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+release 2.1.1
+ Initial conferencing support.
+ fd.o #32718: return InvalidHandle if calling to self or anonymous handle
+ fd.o #30954: advertize Message mixin immutable properties
+ fd.o #31726: use TpBaseChannel
+ fd.o #31664: avoid deprecated tp_get_bus
+
release 2.1.0
Initial release for oFono 0.33 and later.
Refactored modem interface.
diff --git a/configure.ac b/configure.ac
index d67fde1..f3ae227 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([telepathy-ring], [2.1.0+])
+AC_INIT([telepathy-ring], [2.1.1])
AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([foreign 1.9])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])