diff libpurple/conversation.h @ 29829:90dbc46a771f

Fixup merge
author Marcus Lundblad <ml@update.uu.se>
date Mon, 22 Mar 2010 22:26:14 +0000
parents dcd52d2b1b97
children c0945d2291b9 6c660dc7cb6a
line wrap: on
line diff