merge of '6539418cb140f21a3e5d070385f5c1da4928169a'

Wed, 19 Aug 2009 00:41:20 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Wed, 19 Aug 2009 00:41:20 +0000
changeset 28279
35f9ce93a65c
parent 28278
6539418cb140 (current diff)
parent 28241
2bf7a28e0081 (diff)
child 28280
db3ae063db76
child 28282
2a9f9b811b61
child 32365
0c722056e496

merge of '6539418cb140f21a3e5d070385f5c1da4928169a'
and '2bf7a28e00819fcc0ade87b781b146a87eeca8a7'

--- a/configure.ac	Wed Aug 19 00:37:01 2009 +0000
+++ b/configure.ac	Wed Aug 19 00:41:20 2009 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [6])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [6])
-m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [2])
+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]))
@@ -55,8 +55,8 @@
 m4_define([gnt_lt_current], [6])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [6])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_micro_version], [2])
+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]))
--- a/finch/libgnt/configure.ac	Wed Aug 19 00:37:01 2009 +0000
+++ b/finch/libgnt/configure.ac	Wed Aug 19 00:41:20 2009 +0000
@@ -24,11 +24,11 @@
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [5])
+m4_define([gnt_lt_current], [6])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [5])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_minor_version], [6])
+m4_define([gnt_micro_version], [2])
+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]))

mercurial