Mercurial > pidgin.yaz
diff libpurple/plugin.h @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 8282911d5e17 |
children | 96af49d5758d 584063555949 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 8282911d5e17 |
children | 96af49d5758d 584063555949 |