pidgin: 89a4f914: Pull in changes from the im.pidgin.pidgi...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 89a4f914ccc668cb5ef2e9d16cf1652efb275071
Ancestor: dd712fa84e46b2d78adf28e914d3e1a5c18a5154
Author: markdoliner at pidgin.im
Date: 2009-08-19T00:18:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/89a4f914ccc668cb5ef2e9d16cf1652efb275071

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac

ChangeLog: 

Pull in changes from the im.pidgin.pidgin.2.6.2 branch and add "devel"
back to configure.ac

-------------- next part --------------
============================================================
--- ChangeLog	48753371fcab160eb223411dc7daf81fa558bbe5
+++ ChangeLog	525018a153e966012ddaa7d92ebbb12370d0ad46
@@ -1,5 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.1 (08/18/2009):
+	* Fix a crash when some users send you a link in a Yahoo IM
+	* Fix compilation with GTK+ < 2.6.0
+	* Fix compilation on Windows
+
 version 2.6.0 (08/18/2009):
 	libpurple:
 	* Theme support in libpurple thanks to Justin Rodriguez's summer of code
============================================================
--- ChangeLog.API	0bc7825d2f66fd2d80fda11ff04e3946d5c2a5c9
+++ ChangeLog.API	0c82eaa4e57494be81c426ce39b9e2c479b214cb
@@ -1,5 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.1 (08/18/2009):
+	No changes
+
 version 2.6.0 (08/18/2009):
 	libpurple:
 		Added:
============================================================
--- ChangeLog.win32	408ba6b086c256320efa0e898778884536256569
+++ ChangeLog.win32	49d440d9169a22ceb81ef79f04479b86a0ec95f1
@@ -1,3 +1,6 @@
+version 2.6.1 (08/18/2009):
+	* No changes
+
 version 2.6.0 (08/18/2009):
 	* Added XMPP URI support.
 
============================================================
--- NEWS	f39f6676f9107e54e4162849b9f1a96d44ac12a3
+++ NEWS	589e02155161b45f9c3e9146922253b68e94478d
@@ -2,6 +2,11 @@ Our development blog is available at: ht
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.6.1 (08/18/2009):
+	Mark: There were a lot of changes in 2.6.0, and so a few major bugs
+	crept in.  This is a very minor release to fix those bugs.  Sorry for
+	the inconvenience!
+
 2.6.0 (08/18/2009):
 	John:  Wow, four straight releases that I'm the first to NEWS on.  This
 	is getting kinda scary!  I'm beginning to wonder who else actually does
============================================================
--- configure.ac	07b5ceba9f6e3a3a7d6c15e16f1d378c31d4334e
+++ configure.ac	bfd12c9ad4eb9caef1b67a37be401a73d31f7084
@@ -46,8 +46,8 @@ m4_define([purple_minor_version], [6])
 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_minor_version], [6])
 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]))