diff libpurple/conversation.h @ 30524:6d69151fa99b

Merge fix. There is still a change lost that should be re-introduced in libpurple/media
author Marcus Lundblad <ml@update.uu.se>
date Thu, 18 Feb 2010 22:20:06 +0000
parents dcd52d2b1b97
children c0945d2291b9 6c660dc7cb6a
line wrap: on
line diff