diff libpurple/conversation.h @ 20869:2a6ef74f5a4e

merge of '3efb5d625e5a73423be8be77a6baeed0b65f7e55' and 'c848ad4c20988b5dac9ac164455d3ba2d7307230'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 10 Oct 2007 01:06:16 +0000
parents f296be2a1039
children 4511d15a8f80
line wrap: on
line diff