aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-06 15:45:41 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-06 15:45:41 +0800
commitff7a5a1efe769532579f3d1f05c0482980fc6295 (patch)
tree05c6855601b308f454e74ec05faf061146adf37c
parentbd55c7dec76d6c95d294ee60da616b7fe51d181a (diff)
downloadgsoc2013-empathy-EMPATHY_3_4_0_2.tar
gsoc2013-empathy-EMPATHY_3_4_0_2.tar.gz
gsoc2013-empathy-EMPATHY_3_4_0_2.tar.bz2
gsoc2013-empathy-EMPATHY_3_4_0_2.tar.lz
gsoc2013-empathy-EMPATHY_3_4_0_2.tar.xz
gsoc2013-empathy-EMPATHY_3_4_0_2.tar.zst
gsoc2013-empathy-EMPATHY_3_4_0_2.zip
prepare 3.4.0.2EMPATHY_3_4_0_2
-rw-r--r--NEWS6
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f68ff3465..cbf645ca1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+NEW in 3.4.0.2 (06/04/2012)
+==============
+
+This release fixes the build with --enable-empathy-av and brings back the
+"Previous conversations" menu item which has been accidentally removed.
+
NEW in 3.4.0.1 (05/04/2012)
==============
diff --git a/configure.ac b/configure.ac
index 588455edb..004d2ed26 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], [1])
+m4_define([empathy_nano_version], [2])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],