summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Doliner <mark@kingant.net>2014-11-22 10:26:09 -0800
committerMark Doliner <mark@kingant.net>2014-11-22 10:26:09 -0800
commita9717b74798f2c26cf4f63496dc0048ccfb733e7 (patch)
tree7207c8efd1f9edbc75581ab4ebec037c9509dfbe
parent2a7c9a2b1582b2002ee3ce4bcb3d1240fbcf9852 (diff)
downloadpidgin-a9717b74798f2c26cf4f63496dc0048ccfb733e7.tar.gz
Prep for 2.10.11.
I'm hoping to build and release tomorrow. Does that sound ok to people?
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a1773210cc..598a95cc18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
-version 2.10.11 (?/?/?):
+version 2.10.11 (11/23/14):
General:
* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
plugin (#16412)
diff --git a/configure.ac b/configure.ac
index 9078ace493..51471b1f5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ 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], [devel])
+m4_define([purple_version_suffix], [])
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], [devel])
+m4_define([gnt_version_suffix], [])
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]))