summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Doliner <mark@kingant.net>2014-10-22 07:28:30 -0700
committerMark Doliner <mark@kingant.net>2014-10-22 07:28:30 -0700
commit6875c7631796d07ee5f83187fce39d7ee731e406 (patch)
tree748b8c891f49748320f09d83914e45fd1c8db853
parent795bfb25ac0228ba5714f938707d2275d1761bad (diff)
downloadpidgin-6875c7631796d07ee5f83187fce39d7ee731e406.tar.gz
Prep for development.
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.API3
-rw-r--r--configure.ac6
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4029f2f808..217609d8ea 100644
--- 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.11 (?/?/?):
+ Stuff:
+ * Things.
+
version 2.10.10 (10/22/14):
General:
* Check the basic constraints extension when validating SSL/TLS
diff --git a/ChangeLog.API b/ChangeLog.API
index 75569d3a58..d0f581533e 100644
--- 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.11:
+ * No changes
+
version 2.10.10:
* No changes
diff --git a/configure.ac b/configure.ac
index c6268810b8..6f849b58ad 100644
--- 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], [10])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [11])
+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]))