aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-27 17:55:52 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-27 17:55:52 +0800
commitfabd83a72b86ef04a61a5b89493214f4e317bb27 (patch)
tree877473bb0ca474a2b4525dfeb8c6cf1f5db3b12d
parent284d3c729f9cb30610ddee56c479d1176270f854 (diff)
downloadgsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.tar
gsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.tar.gz
gsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.tar.bz2
gsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.tar.lz
gsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.tar.xz
gsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.tar.zst
gsoc2013-empathy-fabd83a72b86ef04a61a5b89493214f4e317bb27.zip
prepare 3.4.2.2EMPATHY_3_4_2_2
-rw-r--r--NEWS9
-rw-r--r--configure.ac4
2 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2c7845120..fd5332592 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+NEW in 3.4.2.2 (27/06/2012)
+==============
+
+This releases fixes an empathy-chat crash caused by a race in telepathy-glib.
+
+Bugs fixed:
+ - Fixed #678307, irc connection parameters dialog: "apply" button stays unsensitive (Guillaume Desmottes)
+ - Fixed #678807, empathy-chat crashed with SIGSEGV in _tp_base_client_handle_channels() (Guillaume Desmottes)
+
NEW in 3.4.2.1 (21/05/2012)
==============
diff --git a/configure.ac b/configure.ac
index eae95ee01..9046bcdf9 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], [1])
+m4_define([empathy_nano_version], [2])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],