Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/disco.h @ 19296:2ec9d975a37d
merge of '2a491439465c5e397575898b7acc45446c9e2eeb'
and '8c7ff33a8a8e1839194829073ff671638fd0b1be'
author | Richard Nelson <wabz@pidgin.im> |
---|---|
date | Fri, 17 Aug 2007 00:35:12 +0000 |
parents | 32c366eeeb99 |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
19293:758b71dcd354 | 19296:2ec9d975a37d |
---|