summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2011-06-01 12:12:54 -0300
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2011-06-01 12:12:54 -0300
commit13e760f621a477dd89f951ef10e56f44760b46cb (patch)
treed973650494c3f3c4b2963a37dfb53516291ac5f1
parent9bc673ae56e33fb7fc76c45b265b2b800d94b1a3 (diff)
Prepare release 0.6.1telepathy-qt4-0.6.1
-rw-r--r--CMakeLists.txt4
-rw-r--r--NEWS11
2 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e07bc2d..8e97935f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,8 @@ endif(POLICY CMP0011)
# set nano_version to 1
set(TP_QT4_MAJOR_VERSION 0)
set(TP_QT4_MINOR_VERSION 6)
-set(TP_QT4_MICRO_VERSION 0)
-set(TP_QT4_NANO_VERSION 1)
+set(TP_QT4_MICRO_VERSION 1)
+set(TP_QT4_NANO_VERSION 0)
# This value contains the library's SOVERSION. This value is to be increased everytime an API/ABI break
# occurs, and will be used for the SOVERSION of the generated shared libraries.
diff --git a/NEWS b/NEWS
index 2a000862..3b35c99f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,16 @@
-telepathy-qt4 0.6.1 (UNRELEASED)
+telepathy-qt4 0.6.1 (2011-06-01)
================================
-The "..." release.
+The "Doc(tor) Love" release.
Enhancements:
- * ...
+ * Crosslink our doxygen docs to Qt documentation
Fixes:
- * ...
+ * fd.o #36881 - Wrong documentation for Tp::Account::connectionStatusChanged
+ (and a bunch of other parts of the API)
+ * fd.o #31769 - The documentation of TextChannel's features is not very helpful
+ * Skip docs generation for internal OptionalInterfaceCache
telepathy-qt4 0.6.0 (2011-05-16)
================================