Mercurial > pidgin
comparison libpurple/plugin.c @ 25889:e2b193decaa5
explicit merge of '814d53152c168c9c4732b3d084260711d536fba6'
and 'af375020001eed33302b471e7ee9dec6a478e824'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 02 Jan 2009 22:23:58 +0000 |
| parents | 8282911d5e17 |
| children | 568b786c36f9 a6e3cb32cdd2 |
comparison
equal
deleted
inserted
replaced
| 24844:94a47062819c | 25889:e2b193decaa5 |
|---|
