aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-14 22:48:47 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-14 22:48:47 +0800
commit331e71add030aaddfdbf2ac95346d42b07c67415 (patch)
treea45e260114071318479b371307c6197da22a6b08
parent1a61af6de2fc25206edd16818263f6972e16c9a2 (diff)
downloadgsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.tar
gsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.tar.gz
gsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.tar.bz2
gsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.tar.lz
gsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.tar.xz
gsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.tar.zst
gsoc2013-empathy-331e71add030aaddfdbf2ac95346d42b07c67415.zip
prepare 3.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 f698037ef..962843691 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+NEW in 3.2.2 (14/11/2011)
+============
+
+This stable release fixes a bunch of memory leaks in the log viewer and a
+packing issue in the accounts dialog.
+
+Bugs fixed:
+ - Fixed #663567, Status icon is miss aligned in infobar (Danielle Madeley)
+
NEW in 3.2.1.2 (07/11/2011)
==============
diff --git a/configure.ac b/configure.ac
index 8d5327cb7..604674c45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 1)
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [2])
-m4_define([empathy_micro_version], [1])
-m4_define([empathy_nano_version], [2])
+m4_define([empathy_micro_version], [2])
+m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],