pidgin.next.minor: ccf1c70e: These numbers merged incorrectly.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ccf1c70ee84a00016887a8c9f790556a4c6fb6d5
Ancestor: fde7362311652605097c22faa8f7a48efb18b471
Author: qulogic at pidgin.im
Date: 2009-08-19T00:54:27
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/ccf1c70ee84a00016887a8c9f790556a4c6fb6d5

Modified files:
        configure.ac finch/libgnt/configure.ac

ChangeLog: 

These numbers merged incorrectly.

-------------- next part --------------
============================================================
--- configure.ac	82de5f99553f4c154592e9edfb66e65b9a1f5c40
+++ configure.ac	493717f07afd4d9ac395bccb4e74acf1b05ee306
@@ -46,7 +46,7 @@ m4_define([purple_minor_version], [7])
 m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
-m4_define([purple_micro_version], [2])
+m4_define([purple_micro_version], [0])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@ m4_define([gnt_minor_version], [7])
 m4_define([gnt_lt_current], [7])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [7])
-m4_define([gnt_micro_version], [2])
+m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
============================================================
--- finch/libgnt/configure.ac	c9d6a63e6b84c5cf4dd6d108592d5ca359372704
+++ finch/libgnt/configure.ac	6262c36ac78186cbf3fc610d4f6e7584af2d6e9a
@@ -24,10 +24,10 @@ AC_PREREQ([2.50])
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [6])
+m4_define([gnt_lt_current], [7])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [6])
-m4_define([gnt_micro_version], [2])
+m4_define([gnt_minor_version], [7])
+m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])