prepare 3.6.1

diff --git a/NEWS b/NEWS
index 22907b03ffa0f0cd996f4f0fc7334cb8ffe5e8ea..03893b32240f18cc5cf30a3c352e00af23f372c9 100644 (file)
--- 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 7f1860322ac31dbf3827e1437657b19839a4d54e..212e6ad5f63fd7a8c7f13e103209d66d340e4ec8 100644 (file)
--- 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],