Mercurial > pidgin
changeset 28004:5479ffb6ec6c
merge of '89a4f914ccc668cb5ef2e9d16cf1652efb275071'
and 'eb9385f349a20856b9d3f9911dbc8024caa44052'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 19 Aug 2009 00:56:19 +0000 |
| parents | 584e063285b7 (diff) 268f58ce1289 (current diff) |
| children | 593a23ffa89c |
| files | ChangeLog |
| diffstat | 4 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 19 00:41:20 2009 +0000 +++ b/ChangeLog Wed Aug 19 00:56:19 2009 +0000 @@ -1,9 +1,14 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.6.1 (??/??/2009): +version 2.6.2 (??/??/2009): XMPP: * Prompt the user before cancelling a presence subscription. +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 Wed Aug 19 00:41:20 2009 +0000 +++ b/ChangeLog.API Wed Aug 19 00:56:19 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 Wed Aug 19 00:41:20 2009 +0000 +++ b/ChangeLog.win32 Wed Aug 19 00:56:19 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 Wed Aug 19 00:41:20 2009 +0000 +++ b/NEWS Wed Aug 19 00:56:19 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