summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-09-12 09:52:51 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-09-12 09:52:51 +0200
commit7c2d4386c9781ea0b1e485cc84ac098217a00191 (patch)
tree5499cde310b6f27e0b3041fa8b460dd9df9fb454
parent05687495cc78fe906ebe760e0f1fccaffc768bb0 (diff)
downloadempathy-7c2d4386c9781ea0b1e485cc84ac098217a00191.tar.gz
-rw-r--r--NEWS17
-rw-r--r--configure.ac4
2 files changed, 19 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d38aafca6..df1ed3fc9 100644
--- 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 dbe1e482c..958ee7c45 100644
--- 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'