Mercurial > pidgin
changeset 17388:c8ee24d443c6
merge of '158f2188a42dc47993ef8c4456fb084051cd485e'
and '69f1848deb99093ace5393f554c3554be7f07735'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Wed, 30 May 2007 04:37:55 +0000 |
| parents | f5de0f3c0034 (diff) 103a37dd9398 (current diff) |
| children | c52b7911a229 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 30 03:57:31 2007 +0000 +++ b/ChangeLog Wed May 30 04:37:55 2007 +0000 @@ -5,6 +5,7 @@ * Moving an ICQ buddy from one group to another no longer re-requests authorization from that person (Rene Hausleitner) * Added nullprpl, an example protocol plugin (Ryan Barrett) + * Fixed SOCKS5 bug which caused Jabber file receiving to fail Finch: * Auto account reconnecting