/pidgin/main: 4992bd90d8ad: I guess I'll release this later toda...

[Mark Doliner]

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

Description:

I guess I'll release this later today.  Is that ok with everyone?

diffstat:

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

diffs (34 lines):

diff --git a/ChangeLog b/ChangeLog
--- 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.6:
+version 2.10.6 (07/06/2012):
 	Pidgin:
 	* Fix a bug that requires a triple-click to open a conversation
 	  window from the buddy list. (#15199)
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [10])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
-m4_define([purple_micro_version], [5])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_micro_version], [6])
+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_major_version], [2])
 m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [9])
-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]))