aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-10-08 17:38:39 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-10-08 17:38:39 +0800
commitd67bba0abef5b9292ebe98172e585bfee6d31ce6 (patch)
treeff3cc379eec8bc1116be532a892d172218fde645
parent1f9d768687c91fb89be8ed73a2300038cfb38ede (diff)
downloadgsoc2013-empathy-d67bba0abef5b9292ebe98172e585bfee6d31ce6.tar.gz
gsoc2013-empathy-d67bba0abef5b9292ebe98172e585bfee6d31ce6.tar.zst
gsoc2013-empathy-d67bba0abef5b9292ebe98172e585bfee6d31ce6.zip
prepare 3.6.0.2EMPATHY_3_6_0_2
-rw-r--r--NEWS22
-rw-r--r--configure.ac4
2 files changed, 24 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ad58bb6f5..ca09083ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+NEW in 3.6.0.2 (08/10/2012)
+==============
+
+This new stable release fixes a crash when approving a chat from the contact
+list.
+
+Bugs fixed:
+ - Fixed #681725, empathy crashed with SIGSEGV in g_slist_remove() (Guillaume Desmottes)
+ - Fixed #684898, empathy-chat is very slow to start (Guillaume Desmottes)
+ - Fixed #685498, Aborts if accounts database can't be read (Guillaume Desmottes)
+ - Fixed #685652, memory leak fixes (Pavel Vasin)
+ - Fixed #685663, Chat themes don't follow system font configuration (Sjoerd Simons)
+
+Translations:
+ - Updated ar Translation (Khaled Hosny)
+ - Updated fr Translation (Alexandre Franke)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated km Translation (Khoem Sokhem)
+ - Updated lv Translation (RÅ«dolfs Mazurs)
+ - Updated zh_HK Translation (Chao-Hsiung Liao)
+ - Updated zh_TW Translation (Chao-Hsiung Liao)
+
NEW in 3.6.0.1 (03/10/2012)
==============
diff --git a/configure.ac b/configure.ac
index 3ef634ce5..a7a459c14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [6])
m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_nano_version], [2])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],