summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-11-17 15:45:12 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-11-17 15:45:12 +0000
commit42b8e444b927255926a1bebbb42031132f627de0 (patch)
tree2364968322e80c6acda0d5ea7a0557d2627fa6a3
parentcf9705c065db569ff42867f20a193e48e6aaf855 (diff)
parentc57ceef0a3a3b8dd6a134856fa3abb49ce56ae5f (diff)
Merge branch 'telepathy-glib-0.12'
Conflicts: NEWS configure.ac
-rw-r--r--NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index ecd022874..f31f33b57 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
telepathy-glib 0.13.6 (UNRELEASED)
==================================
+This release includes all the fixes from 0.12.4.
+
API changes:
• Pointers to a GObject implementing TP_TYPE_CLIENT_CHANNEL_FACTORY are now