# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1250642480 0
# Node ID 268f58ce128910a68e54d28e96e47f6cdbf6eba5
# Parent  901476dc70b93a819a1ad8c4cc83d455b53043e9# Parent  a195ce8eb8059daff8220a0beb779692ba375dad
merge of '53b02d9c3c8aa71b13cea90eea22a0b60155dc8c'
     and '7c150a3616a42da59174d4b392caadb4df5f0d2c'

diff -r 901476dc70b9 -r 268f58ce1289 configure.ac
--- 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]))
diff -r 901476dc70b9 -r 268f58ce1289 finch/libgnt/configure.ac
--- 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]))