diff libpurple/conversation.h @ 16212:7f1252c6ff6e

merge of 'a0cdc54d9604b75f423f6a7858a809cd60a9fcff' and 'ff555bb9cf32dba606ab35f91bff2658668bb894'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 16 Apr 2007 21:42:19 +0000
parents e058328dc954
children 516f14bef90e
line wrap: on
line diff