Mercurial > pidgin
changeset 26194:c884b702ec17
merge of '661d9bf066d7a7b9605d9c606427c4b5f88b19e0'
and '7a2aef410b0494a07f77f77172b208903128c05c'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 18 Mar 2009 19:30:16 +0000 |
| parents | 640f46b09d5f (diff) a2b1ad53477a (current diff) |
| children | bcbc5994d21c 7c2506045671 |
| files | ChangeLog |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 17 00:56:37 2009 +0000 +++ b/ChangeLog Wed Mar 18 19:30:16 2009 +0000 @@ -6,8 +6,9 @@ project. With some minor additions and clean ups from Paul Aurich. XMPP: - * Add support for in-band bytestreams (XEP-0047). - * Add support for attention (XEP-0224). + * Add support for in-band bytestreams for file transfers (XEP-0047). + * Add support for sending attentions (equivalent to "buzz" and "nudge") + using the command /buzz (XEP-0224). Pidgin: * Added -f command line option to tell Pidgin to ignore NetworkManager