summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-13 12:40:11 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-13 12:46:40 +0200
commit6dd1e61df46aabe6d24af0c7bd2ea7a5313b7c24 (patch)
tree9b2d1f08e5c945ee3d40e2bb5ccf85fd245edc21
parentc519ac92b5c2b928685edbb05e3dc781885ff07d (diff)
downloadempathy-6dd1e61df46aabe6d24af0c7bd2ea7a5313b7c24.tar.gz
prepare 2.31.5.1EMPATHY_2_31_5_1
-rw-r--r--NEWS13
-rw-r--r--configure.ac4
2 files changed, 15 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 76e283c19..f1b586e25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+NEW in 2.31.5.1 (13/07/2010)
+===============
+
+A small release fixing detection of libnm-glib which was accidentally
+broken in 2.31.5.
+
+Bugs fixed:
+ - Fixed #624202, empathy requires libnm_glib instead of libnm-glib (Laurent Bigonville)
+
+Translations:
+ - Updated gl Translation (Fran DiƩguez)
+ - Updated he Translation (Yaron Shahrabani)
+
NEW in 2.31.5 (12/07/2010)
=============
diff --git a/configure.ac b/configure.ac
index 12d3fd013..fc092443f 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], [31])
m4_define([empathy_micro_version], [5])
-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],