aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-23 22:59:14 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-23 22:59:14 +0800
commitbc624045f0a4f4b1182efb3c6ec63c0de5a67c13 (patch)
tree413e0fa925b09f347b480c5f281677d1f5d1257a
parent307a2f30b5a426ef97d7f566d3970d48e9a9613d (diff)
parentc5a04417666fa66dcf5502dd1a9f39ed15db1227 (diff)
downloadgsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.tar
gsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.tar.gz
gsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.tar.bz2
gsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.tar.lz
gsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.tar.xz
gsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.tar.zst
gsoc2013-empathy-bc624045f0a4f4b1182efb3c6ec63c0de5a67c13.zip
Merge branch 'release.py'
-rw-r--r--NEWS11
-rw-r--r--configure.ac4
2 files changed, 13 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ca89d8a74..32e6d7a2f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+NEW in 2.91.4.1 (23/12/2010)
+===============
+
+The main goal of this release is to be able to build with GTK+ 2.91.7 (and
+make Vincent happy :).
+
+Bugs fixed:
+ - Fixed #637799, Empty Contact menu on chatrooms (Guillaume Desmottes)
+ - Fixed #637854, Empathy depends upon removed gdk_spawn_on_screen() (Guillaume Desmottes)
+ - Fixed #637855, Empathy depends upon removed gdk_xid_table_lookup() (Guillaume Desmottes)
+
NEW in 2.91.4 (20/12/2010)
=============
diff --git a/configure.ac b/configure.ac
index aadc26773..b48857ad7 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], [4])
-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],