Mercurial > pidgin
changeset 28001:584e063285b7
Pull in changes from the im.pidgin.pidgin.2.6.2 branch and add "devel"
back to configure.ac
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 19 Aug 2009 00:18:54 +0000 |
| parents | 617e7a90b69c |
| children | 5479ffb6ec6c |
| files | ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac |
| diffstat | 5 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 18 23:52:14 2009 +0000 +++ b/ChangeLog Wed Aug 19 00:18:54 2009 +0000 @@ -1,5 +1,10 @@ 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
--- a/ChangeLog.API Tue Aug 18 23:52:14 2009 +0000 +++ b/ChangeLog.API Wed Aug 19 00:18:54 2009 +0000 @@ -1,5 +1,8 @@ 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:
--- a/ChangeLog.win32 Tue Aug 18 23:52:14 2009 +0000 +++ b/ChangeLog.win32 Wed Aug 19 00:18:54 2009 +0000 @@ -1,3 +1,6 @@ +version 2.6.1 (08/18/2009): + * No changes + version 2.6.0 (08/18/2009): * Added XMPP URI support.
--- a/NEWS Tue Aug 18 23:52:14 2009 +0000 +++ b/NEWS Wed Aug 19 00:18:54 2009 +0000 @@ -2,6 +2,11 @@ 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
--- a/configure.ac Tue Aug 18 23:52:14 2009 +0000 +++ b/configure.ac Wed Aug 19 00:18:54 2009 +0000 @@ -46,8 +46,8 @@ 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_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]))