Mercurial > pidgin

changeset 32795:a359399cc0ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '22d544ffc6215f22b81d1dc34931bad4c82775c2' and '886d323c01f7c8cdf2a5e4ff42eefbab045b1f1f'
author Mark Doliner <mark@kingant.net>
date Sun, 06 May 2012 17:52:46 +0000
parents b4c2802af7f8 (current diff) 9350878c0b38 (diff)
children 5ae7e1f36b43
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Sun May 06 14:45:01 2012 +0000
+++ b/ChangeLog.API	Sun May 06 17:52:46 2012 +0000
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.4:
+	* No changes
+
 version 2.10.3:
 	* No changes
 
--- a/configure.ac	Sun May 06 14:45:01 2012 +0000
+++ b/configure.ac	Sun May 06 17:52:46 2012 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
 m4_define([purple_micro_version], [4])
-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]))