aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-14 17:20:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-14 17:20:17 +0800
commit2dd5ba424137015582904b7092c5157e419c4b60 (patch)
tree59adc866f9b585e6fe17115f22711939060dc77c
parent5c78cf4cdb5dfc43a10263bd3854dfc5c97513f6 (diff)
downloadgsoc2013-empathy-EMPATHY_3_1_2_1.tar
gsoc2013-empathy-EMPATHY_3_1_2_1.tar.gz
gsoc2013-empathy-EMPATHY_3_1_2_1.tar.bz2
gsoc2013-empathy-EMPATHY_3_1_2_1.tar.lz
gsoc2013-empathy-EMPATHY_3_1_2_1.tar.xz
gsoc2013-empathy-EMPATHY_3_1_2_1.tar.zst
gsoc2013-empathy-EMPATHY_3_1_2_1.zip
prepare 3.1.2.1EMPATHY_3_1_2_1
-rw-r--r--NEWS17
-rw-r--r--configure.ac4
2 files changed, 19 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ebf172d49..c9f9fec54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+NEW in 3.1.2.1 (14/06/2011)
+==============
+
+A small fix release as 3.1.2 was shipping an outdated version of
+telepathy-yell. We also now depends on telepathy-logger 0.2.10 as the new log
+viewer was unusable with older versions.
+
+Dependencies:
+
+ • telepathy-logger ≥ 0.2.10
+
+Translations:
+ - Updated gl Translation (Fran Diéguez)
+ - Updated es Translation (Jorge González, Daniel Mustieles)
+ - Updated ug Translation (Abduxukur Abdurixit)
+ - Updated sl Translation (Matej Urbančič)
+
NEW in 3.1.2 (10/06/2011)
============
diff --git a/configure.ac b/configure.ac
index 375aa2ad5..c6b691dba 100644
--- 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], [1])
m4_define([empathy_micro_version], [2])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],