prepare 3.6.0.2

diff --git a/NEWS b/NEWS
index ad58bb6f550e9f7126a37c7d09ada1be95e8f40c..ca09083efdd969bd48c6e1c7e319d2c0ee36c0d5 100644 (file)
--- 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 3ef634ce5c59d670f90bab963071267db4a1a11e..a7a459c14b6dc1325cee92ebeba5c4d909d43a3d 100644 (file)
--- 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],