Mercurial > pidgin.yaz
changeset 17119:9fae99335d35
explicit merge of 'ef6a11abfc06ebecc3c74e3ab793e47d50125989'
and '170834fdc3a89a6584a59a36ce1f43914acd3a2c'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 May 2007 07:47:16 +0000 |
| parents | 3752ac0e610c (diff) 79f6b097a0a6 (current diff) |
| children | 3034129a10b6 |
| files | ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 14 23:17:42 2007 +0000 +++ b/ChangeLog Sat May 19 07:47:16 2007 +0000 @@ -24,7 +24,7 @@ * Identify the account when warning about plaintext auth over an unencrypted channel * Fix XMPP SASL authentication error when using Cyrus and a connect server - * Fix changing tab locations to update properly + * Fix changing tab locations to update properly * Turning off "Show formatting on incoming messages" now ignores formatting in <span> tags too * File transfer progress for transfers on MSN is now correctly displayed