Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/peer_proxy.c @ 32818:08151b40c598
merge of '071d7e809e0a4532e6dc367a6f05ea43e1ab0de0'
and 'f7828c5032d27f14c4543fe56ed1b5cecb5517f7'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 07 Nov 2011 02:07:59 +0000 |
parents | 01a8f82edc45 |
children |
comparison
equal
deleted
inserted
replaced
32816:ec6371d4cae8 | 32818:08151b40c598 |
---|