summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-20 15:07:13 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-20 15:07:13 +0100
commit5b5ee4862e11ab2b12d8f652d06b45600dc358af (patch)
tree0fe10dcba6efdf8a43bf0b996afbf2738244235d /NEWS
parent0bb531d7856f4b79edd7d328cef59e58f7f08ac8 (diff)
parentef2ea07d1b27dabd87e0ae028396138f78d1970a (diff)
downloadtelepathy-mission-control-5b5ee4862e11ab2b12d8f652d06b45600dc358af.tar.gz
Merge branch 'telepathy-mission-control-5.12' into master
Conflicts: NEWS configure.ac
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS7
1 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a98a7fe6..59751150 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,12 @@
telepathy-mission-control 5.13.2 (UNRELEASED)
=============================================
-...
+Fixes:
+
+• Recover from incomplete password migrations caused by upgrading to
+ Empathy 3 while running MC 5.12.1 or older, by deleting the old (MC) copy
+ of the password if Empathy has already copied it (fd.o #42088, Simon)
+• Omit generated file mcp-signals-marshal.h from tarballs (Simon)
telepathy-mission-control 5.13.1 (2012-09-06)
=============================================