aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-21 20:04:48 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-21 20:06:14 +0800
commit71cab9b191860ec1208cc4b144be9409e16f780a (patch)
tree9903f61bd62cf69ab9f5e975e91064ead1cda962
parenta7feeae6d2028daa75a36e4a0f992877faabf1d9 (diff)
downloadgsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.tar
gsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.tar.gz
gsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.tar.bz2
gsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.tar.lz
gsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.tar.xz
gsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.tar.zst
gsoc2013-empathy-71cab9b191860ec1208cc4b144be9409e16f780a.zip
Prepare 3.4.2.1EMPATHY_3_4_2_1
-rw-r--r--NEWS14
-rw-r--r--configure.ac4
2 files changed, 16 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c2983c407..2c7845120 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+NEW in 3.4.2.1 (21/05/2012)
+==============
+
+This release fixes various issues in the call UI and a crash when taking
+a picture from the avatar chooser dialog.
+
+Dependencies:
+ • clutter-gtk ≥ 1.1.2
+ • cheese ≥ 3.4.0 (optional)
+
+Bugs fixed:
+ - Fixed #670874, floating toolbar not working (Sjoerd Simons)
+ - Fixed #674553, Take picture button in image change doesn't work. (Guillaume Desmottes)
+
NEW in 3.4.2 (14/05/2012)
============
diff --git a/configure.ac b/configure.ac
index eebe69790..d343a0bf1 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], [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],