/pidgin/main: 4a49f817e5de: Prep for 2.10.6

[Mark Doliner]

Changeset: 4a49f817e5deb3b58bee83627731896ae2023e43
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2012-07-05 08:38 -0700
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/4a49f817e5de

Description:

Prep for 2.10.6

diffstat:

 ChangeLog     |  5 ++++-
 ChangeLog.API |  3 +++
 configure.ac  |  4 ++--
 po/ChangeLog  |  3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diffs (67 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -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
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -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]))
diff --git a/po/ChangeLog b/po/ChangeLog
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -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)