diff libpurple/conversation.h @ 18803:abb9aac69507

merge of '7ee71f1a32c4a5d7001c0049f2c7ec1e6cb54fa3' and 'c896d38533c1a23a6748a75257104e1f501999e5'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 05 Aug 2007 19:42:29 +0000
parents ab6d2763b8d8
children d57926990768
line wrap: on
line diff