summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-04-14 14:30:54 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-04-14 14:30:54 (GMT)
commit460d0eafa4c585907795d26155ab05315863561b (patch)
treec988430e17e01e0888b1a75cee7d6111de6315c8
parent9de04c34266010d3a5fd833552d20190833b927e (diff)
downloadempathy-460d0eafa4c585907795d26155ab05315863561b.tar.gz
empathy-460d0eafa4c585907795d26155ab05315863561b.tar.xz
3.12.1
-rw-r--r--NEWS7
-rw-r--r--configure.ac4
2 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index db09e5b..b48526c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+NEW in 3.12.1 (14/04/2014)
+=============
+
+Translations:
+ - Updated de Translation (Christian Kirbach)
+ - Updated ru Translation (Yuri Myasoedov)
+
NEW in 3.12.0 (24/03/2014)
=============
diff --git a/configure.ac b/configure.ac
index 28990ab..42c48c3 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], [0])
+m4_define([empathy_micro_version], [1])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'