Mercurial > pidgin
diff libpurple/plugin.c @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 568b786c36f9 |
children | 1b8c18ab762f 68265bcc8814 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 568b786c36f9 |
children | 1b8c18ab762f 68265bcc8814 |