Mercurial > pidgin
comparison libpurple/protocols/jabber/data.c @ 25228:6fed1bb3b02e
Fix merge
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 17 Dec 2008 18:23:36 +0000 |
| parents | 2c6c9d72f54f |
| children | 860ebaf275ae e30e9779e7bf 5f9a24d1c25e |
comparison
equal
deleted
inserted
replaced
| 25227:9100b9176a16 | 25228:6fed1bb3b02e |
|---|