/pidgin/main: fb41de6b6fbb: 2.10.11 has been tagged, so switch t...

Changeset: fb41de6b6fbbfcc2b0ba613c8ca88372a9545fc5
Author:	 Mark Doliner <[email protected]>
Date:	 2014-11-23 08:55 -0800
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/fb41de6b6fbb

Description:

2.10.11 has been tagged, so switch this back to dev mode.

diffstat:

 ChangeLog     |  4 ++++
 ChangeLog.API |  3 +++
 configure.ac  |  6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.12 (MM/DD/YY):
+	Something:
+	* Details.
+
 version 2.10.11 (11/23/14):
 	General:
 	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
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.12:
+	* No changes
+
 version 2.10.11:
 	* No changes
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -46,8 +46,8 @@ AC_PREREQ([2.50])
 m4_define([purple_lt_current], [10])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
-m4_define([purple_micro_version], [11])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [12])
+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_lt_current], [8])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [10])
-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]))