Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/chat.c @ 29115:cfcf5076b73f
merge of '1cebb8e5585732c30dcfb31a6700dcb78ae47b44'
and '9e66a21277bce5b8be225115269300903be335ea'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 01 Dec 2009 21:36:55 +0000 |
parents | 4ab6f0479bc5 |
children | c8b407fec879 |
comparison
equal
deleted
inserted
replaced
29114:1bb466ce21b8 | 29115:cfcf5076b73f |
---|