# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1250913575 0
# Node ID e0c20f0e04bc46b76db987648542423777d7a7b0
# Parent  74958cad186d01054b9d2e7915507465fc0ddd2f# Parent  74ddd22cf12e9ecdd4043a3d65d4e60c52f242d6
propagate from branch 'im.pidgin.pidgin' (head 09828caa4a3333f2f0eed91315c29d5b3aa66fcb)
            to branch 'im.pidgin.pidgin.next.minor' (head ccf1c70ee84a00016887a8c9f790556a4c6fb6d5)

diff -r 74958cad186d -r e0c20f0e04bc ChangeLog
--- a/ChangeLog	Sat Aug 22 02:28:23 2009 +0000
+++ b/ChangeLog	Sat Aug 22 03:59:35 2009 +0000
@@ -1,5 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.0 (??/??/????):
+
 version 2.6.2 (??/??/2009):
 	libpurple:
 	* Fix --disable-avahi to actually disable it in configure, as opposed
diff -r 74958cad186d -r e0c20f0e04bc ChangeLog.API
--- a/ChangeLog.API	Sat Aug 22 02:28:23 2009 +0000
+++ b/ChangeLog.API	Sat Aug 22 03:59:35 2009 +0000
@@ -1,5 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.0 (??/??/????):
+
 version 2.6.1 (08/18/2009):
 	No changes
 
diff -r 74958cad186d -r e0c20f0e04bc ChangeLog.win32
--- a/ChangeLog.win32	Sat Aug 22 02:28:23 2009 +0000
+++ b/ChangeLog.win32	Sat Aug 22 03:59:35 2009 +0000
@@ -1,3 +1,5 @@
+version 2.7.0 (??/??/????):
+
 version 2.6.1 (08/18/2009):
 	* No changes
 
diff -r 74958cad186d -r e0c20f0e04bc configure.ac
--- a/configure.ac	Sat Aug 22 02:28:23 2009 +0000
+++ b/configure.ac	Sat Aug 22 03:59:35 2009 +0000
@@ -43,19 +43,19 @@
 #
 # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
 #
-m4_define([purple_lt_current], [6])
+m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
-m4_define([purple_minor_version], [6])
-m4_define([purple_micro_version], [2])
+m4_define([purple_minor_version], [7])
+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])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
 
-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])
diff -r 74958cad186d -r e0c20f0e04bc finch/libgnt/configure.ac
--- a/finch/libgnt/configure.ac	Sat Aug 22 02:28:23 2009 +0000
+++ b/finch/libgnt/configure.ac	Sat Aug 22 03:59:35 2009 +0000
@@ -24,10 +24,10 @@
 # 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])
diff -r 74958cad186d -r e0c20f0e04bc po/ChangeLog
--- a/po/ChangeLog	Sat Aug 22 02:28:23 2009 +0000
+++ b/po/ChangeLog	Sat Aug 22 03:59:35 2009 +0000
@@ -1,5 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.0
+
 version 2.6.1
 	* No changes