aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-02-28 20:54:06 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-02-28 20:54:06 +0800
commit353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77 (patch)
tree8cd90cab22e528e3652b5bf4799a33ff2d3a4c7c
parent5185e5a24bd99ec07ad3a76f8584b2593237f6cd (diff)
downloadgsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.tar
gsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.tar.gz
gsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.tar.bz2
gsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.tar.lz
gsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.tar.xz
gsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.tar.zst
gsoc2013-empathy-353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77.zip
prepare 3.6.4
-rw-r--r--NEWS7
-rw-r--r--configure.ac4
2 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index b0746af01..64a757859 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+NEW in 3.6.4 (28/02/2013)
+============
+
+Bugs fixed:
+ - Fixed #678983, Favorite rooms are not saved (Guillaume Desmottes)
+ - Fixed #693190, re-enable empathy-tls-test (Stef Walter)
+
NEW in 3.6.3 (09/01/2013)
============
diff --git a/configure.ac b/configure.ac
index 373bb7a64..e5a9499d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
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], [6])
-m4_define([empathy_micro_version], [3])
+m4_define([empathy_micro_version], [4])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'