changeset
ChangeLog
Wed, 23 May 2007 23:21:48 +0000
- author
- Sean Egan <seanegan@pidgin.im>
- date
- Wed, 23 May 2007 23:21:48 +0000
- changeset 17299
- 211cd8a67896
- parent 17298
- b69ba13b3b94
- child 17300
- 6e8f285962e7
- child 17304
- 7ee85a843c45
ChangeLog
| ChangeLog | file | annotate | diff | comparison | revisions |
--- a/ChangeLog Wed May 23 23:17:50 2007 +0000 +++ b/ChangeLog Wed May 23 23:21:48 2007 +0000 @@ -25,12 +25,6 @@ unencrypted channel * Fix XMPP SASL authentication error when using Cyrus and a connect server * Fix changing tab locations to update properly -<<<<<<< variant A - * ALSA added as a possible sound method - * Added Google Talk to the accounts dropdown - * Google Talk accounts will not import buddies from your Gmail addres - book ->>>>>>> variant B * 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 @@ -49,8 +43,9 @@ consumption when running with NO_HZ. (Arjan van de Ven with Intel Corporation) * Conversation -> Save As will now use aliases. -####### Ancestor -======= end + * ALSA added as a possible sound method + * Google Talk accounts will not import buddies from your Gmail address + book Finch: * Userlist in chat windows, which can be turned on or off using
