aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-16 19:47:40 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-16 19:47:40 +0800
commit4e3af8361f42c765f3faf1e0499363144edb0cbb (patch)
tree5a46149ece84c95f4ec34ea27d81d0e6e7a705ff
parentf21a356c1f53fa8a737cfd3b979168817b22d933 (diff)
downloadgsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.tar
gsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.tar.gz
gsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.tar.bz2
gsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.tar.lz
gsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.tar.xz
gsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.tar.zst
gsoc2013-empathy-4e3af8361f42c765f3faf1e0499363144edb0cbb.zip
prepare 3.4.1EMPATHY_3_4_1
-rw-r--r--NEWS16
-rw-r--r--configure.ac6
2 files changed, 19 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index cbf645ca1..caf311a07 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+NEW in 3.4.1 (16/04/2012)
+============
+
+Bugs fixed:
+ - Fixed #673691, empathy -h should not present existing roster window (Guillaume Desmottes)
+
+Translations:
+ - Updated ar Translation (Ibrahim Saed)
+ - Updated ca Translation (Jordi Serratosa)
+ - Updated ca@valencia Translation (Carles Ferrando)
+ - Updated hi Translation (Chandan Kumar)
+ - Updated zh_CN Translation (Automatic Mirroring)
+
+Documentation translations:
+ - Updated fr Documentation translation (Bruno Brouard)
+
NEW in 3.4.0.2 (06/04/2012)
==============
diff --git a/configure.ac b/configure.ac
index 33bbf466a..7af5f725e 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], [4])
-m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [2])
+m4_define([empathy_micro_version], [1])
+m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],