Mercurial > pidgin.yaz
changeset 27083:7358c1f6df19
merge of '28778df3113382d631f8cf40ff35a26ca515513f'
and 'ff248f7206a9d4924256440c85e52b5355025efb'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Tue, 02 Jun 2009 21:41:03 +0000 |
| parents | 432f02730dc1 (diff) 5a4451b8fe29 (current diff) |
| children | b709ab0cb4bc |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 02 21:39:53 2009 +0000 +++ b/ChangeLog Tue Jun 02 21:41:03 2009 +0000 @@ -20,8 +20,9 @@ moved to a new network and the old servers are not accessible. XMPP: - * Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177), and - voice support with GTalk and GMail. (Mike "Maiku" Ruprecht) + * Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177), voice + support with GTalk and voice and video support with the GMail web + client. (Mike "Maiku" Ruprecht) * Support for in-band bytestreams for file transfers (XEP-0047). (Marcus Lundblad) * Support for sending and receiving attentions (equivalent to "buzz"