aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-01 22:31:19 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-01 22:31:19 +0800
commit2c101f2718ae343a833e6f1885e11f45db8bc010 (patch)
tree1a0e9b159dd166ed6b4091c19d8563d4c914217f
parent108145120d9c320c81ee276770b2c63abd53ac99 (diff)
parentc9dae1a810f67c37e1218fc42b7364e0e2f91fc2 (diff)
downloadgsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.tar
gsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.tar.gz
gsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.tar.bz2
gsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.tar.lz
gsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.tar.xz
gsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.tar.zst
gsoc2013-empathy-2c101f2718ae343a833e6f1885e11f45db8bc010.zip
Merge branch 'release'
-rw-r--r--NEWS11
-rw-r--r--configure.ac4
2 files changed, 13 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 58c34cd41..04fc1fee8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+NEW in 2.91.6.1 (01/02/2011)
+===============
+
+The "How many French speaking hackers do you need to fix a bug?" release.
+
+We finally managed to fix the very annoying bug making Empathy getting stuck in
+a memory eating infinite loop. \o/
+
+Bugs fixed:
+ - Fixed #635105, Empathy is eating all the memory (Guillaume Desmottes)
+
NEW in 2.91.6 (01/02/2011)
=============
diff --git a/configure.ac b/configure.ac
index 9c4c12783..e4c7fe11b 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], [2])
m4_define([empathy_minor_version], [91])
m4_define([empathy_micro_version], [6])
-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],