summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-03-24 16:05:58 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-03-24 16:05:58 +0100
commita3e844ffb8fa971ace5cc41842e4a7895221a0ac (patch)
treea3a95c07668c2c9457719996e6cdd8454af42f36
parentc1bb0f0f74b79bdb90870664bfeadab1649d97fa (diff)
3.12.0
-rw-r--r--NEWS8
-rw-r--r--configure.ac6
2 files changed, 11 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 300e4b9e6..db09e5be9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+NEW in 3.12.0 (24/03/2014)
+=============
+
+Translations:
+ - Updated da Translation (Kenneth Nielsen)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated pa Translation (A S Alam)
+
NEW in 3.11.92 (17/03/2014)
==============
diff --git a/configure.ac b/configure.ac
index 01fce392c..986a6ec33 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], [11])
-m4_define([empathy_micro_version], [92])
+m4_define([empathy_minor_version], [12])
+m4_define([empathy_micro_version], [0])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'