3.12.6

diff --git a/NEWS b/NEWS
index d38aafca65416b4021893b1c59c1ccc9e97d6168..df1ed3fc9e1fbb7f188f208f64fad89b348d8d77 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+NEW in 3.12.6 (12/09/2014)
+=============
+
+Bugs fixed:
+ - Fixed #735575, gnome-contact's desktop file changed (Guillaume Desmottes)
+ - Fixed #736369, Smileys are not centered ("Insert Smiley" menu) (Kevin Haller)
+ - Fix crash if empathy_chatroom_manager_find() failed (Guillaume Desmottes)
+
+Translations:
+ - Updated fi Translation (Ville-Pekka Vainio)
+ - Updated gu Translation (Sweta Kothari)
+ - Updated kn Translation (Shankar Prasad)
+ - Updated ko Translation (Changwoo Ryu)
+ - Updated mr Translation (Sandeep Sheshrao Shedmake)
+ - Updated or Translation (Manoj Kumar Giri)
+ - Updated sk Translation (Dušan Kazik)
+
 NEW in 3.12.5 (20/08/2014)
 =============
 

diff --git a/configure.ac b/configure.ac
index dbe1e482c38b861e632aff31937f30592cbfec08..958ee7c45440e6a2401748646c3aa2940b2f6184 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 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], [12])
-m4_define([empathy_micro_version], [5])
+m4_define([empathy_micro_version], [6])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'