# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1196000214 0
# Node ID b12d8d11d46ce9b53e5be47c0ffffeb0f86a6fa2
# Parent  c956aff707eb49155208997d97290bcdbe1047d7# Parent  6b10805d29bc3375da6cf8fb5d98a5303c736593
merge of '66d234740bd40b14ef7564f178d84ab82816d6e2'
     and '6e23cb6795a35692cf0f84fcea64a7c2748a9bad'

diff -r c956aff707eb -r b12d8d11d46c configure.ac
--- a/configure.ac	Sun Nov 25 02:16:39 2007 +0000
+++ b/configure.ac	Sun Nov 25 14:16:54 2007 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [3])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [3])
-m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [1])
+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], [3])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [3])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_micro_version], [1])
+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 c956aff707eb -r b12d8d11d46c finch/libgnt/configure.ac
--- a/finch/libgnt/configure.ac	Sun Nov 25 02:16:39 2007 +0000
+++ b/finch/libgnt/configure.ac	Sun Nov 25 14:16:54 2007 +0000
@@ -27,8 +27,8 @@
 m4_define([gnt_lt_current], [3])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [3])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_micro_version], [1])
+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]))