# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1180117876 0
# Node ID c155b0496161a4f4c1cd815c5535cd795aa80cd0
# Parent  0eca6ad5619a031054d7bad59df9db9b41008658# Parent  5b38f5ecc49edbc88a987277273266a28673103d
merge of '07bd3af1a492ac68c753a507124c46c586499941'
     and '73fe0aadf00e90ae634f0fbe253a634ce3f60b74'

diff -r 0eca6ad5619a -r c155b0496161 configure.ac
--- a/configure.ac	Fri May 25 18:29:35 2007 +0000
+++ b/configure.ac	Fri May 25 18:31:16 2007 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [0])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [0])
-m4_define([purple_micro_version], [1])
-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], [0])
 m4_define([gnt_major_version], [1])
 m4_define([gnt_minor_version], [0])
-m4_define([gnt_micro_version], [1])
-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]))