aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-02-03 19:00:15 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-02-03 19:00:15 +0800
commitc05fe49ca4c3f2ad444339ebe75dfcfde4a0d779 (patch)
tree56c3246c86d37a9c521cfed2c8487564c3ff4263
parente3b9f2165d0f0b0e64332c8a0643a92453f4e217 (diff)
downloadgsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.tar
gsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.tar.gz
gsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.tar.bz2
gsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.tar.lz
gsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.tar.xz
gsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.tar.zst
gsoc2013-empathy-c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779.zip
3.11.5
-rw-r--r--NEWS15
-rw-r--r--configure.ac4
2 files changed, 17 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 87b202ebb..3369c5036 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+NEW in 3.11.5 (03/02/2014)
+=============
+
+Bugs fixed:
+ - Fixed #637316, Use the new license-type property in the about dialog (Emilio Pozuelo Monfort)
+
+Translations:
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated he Translation (Yosef Or Boczko)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated tg Translation (Victor Ibragimov)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
NEW in 3.11.4 (20/01/2014)
=============
diff --git a/configure.ac b/configure.ac
index c37434abc..02320f4d8 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], [11])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_micro_version], [5])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'