comparison libpurple/prpl.h @ 28959:3de19f8f5c92

merge of '57bf84117d335fd0bba1edff4c5b3b21e29f6bbc' and '681fb86466372d3d72fbfb554c0b766c81d763e6'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 03 Feb 2010 22:48:03 +0000
parents e37f85160784
children 45a94940c122 a538cb73f897
comparison
equal deleted inserted replaced
28957:452043d200f0 28959:3de19f8f5c92