3.12.5

diff --git a/NEWS b/NEWS
index 10a8d288c878d9812c639736ccc498c00824f8fb..d38aafca65416b4021893b1c59c1ccc9e97d6168 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+NEW in 3.12.5 (20/08/2014)
+=============
+
+Bugs fixed:
+ - Fixed #732909, chain GtkCombobox subclass constructors to parent (Frédéric Péters)
+
+Translations:
+ - Updated de Translation (Christian Kirbach)
+
 NEW in 3.12.4 (23/06/2014)
 =============
 

diff --git a/configure.ac b/configure.ac
index 99473075fa92c812b02ebbf6807cf6e80c06eb0c..229ae608ab73c42599863ad7b9c6fb6c17cba54d 100644 (file)
--- 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], [12])
-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'