Mercurial > pidgin
comparison libpurple/prpl.c @ 29267:58e1e1463b6e
Manual merge
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 01 Jan 2009 21:16:19 +0000 |
| parents | 785db7300ef2 |
| children | bcad7dc4b453 8c2631eb5da7 a6e3cb32cdd2 |
comparison
equal
deleted
inserted
replaced
| 29266:008f35e7d538 | 29267:58e1e1463b6e |
|---|