Mercurial > pidgin3 / changeset

--- a/ChangeLog	Mon Jul 02 23:02:14 2012 -0700
+++ b/ChangeLog	Thu Jul 05 08:38:20 2012 -0700
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.6:
+	No changes
+
 version 2.10.5 (07/05/2012):
 	libpurple:
 	* Add support for GNOME3 proxy settings. (Mihai Serban) (#15054)
@@ -15,7 +18,7 @@
 	MXit:
 	* Fix a buffer overflow vulnerability when parsing incoming messages
 	  containing inline images.  Thanks to Ulf Härnhammar for reporting
-	  this!
+	  this! (CVE-2012-3374)
 
 version 2.10.4 (05/06/2012):
 	General:

--- a/ChangeLog.API	Mon Jul 02 23:02:14 2012 -0700
+++ b/ChangeLog.API	Thu Jul 05 08:38:20 2012 -0700
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.6:
+	* No changes
+
 version 2.10.5:
 	* No changes
 

--- a/configure.ac	Mon Jul 02 23:02:14 2012 -0700
+++ b/configure.ac	Thu Jul 05 08:38:20 2012 -0700
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
 m4_define([purple_micro_version], [5])
-m4_define([purple_version_suffix], [])
+m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [9])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))

--- a/po/ChangeLog	Mon Jul 02 23:02:14 2012 -0700
+++ b/po/ChangeLog	Thu Jul 05 08:38:20 2012 -0700
@@ -1,6 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.10.5
+	No changes
+
+version 2.10.5
 	* Burmese translation updated (Thura Hlaing)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)