aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-10-15 23:21:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-10-15 23:21:17 +0800
commit2733d55a3098365e2f8d614fbfe46971d7555f77 (patch)
tree1be5848da808ee4f89fc6bb592d06d29eba13ce5
parent73f27edf1d4a87e58df9bcb8436f87fa60fb84e0 (diff)
downloadgsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.tar
gsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.tar.gz
gsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.tar.bz2
gsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.tar.lz
gsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.tar.xz
gsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.tar.zst
gsoc2013-empathy-2733d55a3098365e2f8d614fbfe46971d7555f77.zip
prepare 3.6.1EMPATHY_3_6_1
-rw-r--r--NEWS13
-rw-r--r--configure.ac6
2 files changed, 16 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 22907b03f..03893b322 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+NEW in 3.6.1 (15/10/2012)
+============
+
+Translations:
+ - Updated da Translation (Ask H. Larsen)
+ - Updated en_GB Translation (Bruce Cowan)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated ko Translation (Changwoo Ryu)
+ - Updated mr Translation (Sandeep Sheshrao Shedmake)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sk Translation (Pavol Klačanský)
+ - Updated th Translation (Theppitak Karoonboonyanan)
+
NEW in 3.6.0.3 (08/10/2012)
==============
diff --git a/configure.ac b/configure.ac
index 7f1860322..212e6ad5f 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], [3])
m4_define([empathy_minor_version], [6])
-m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [3])
+m4_define([empathy_micro_version], [1])
+m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],