diff libpurple/conversation.h @ 22782:a95fcf01f72c

merge of '0e779a37ee17a7bb7ad39bbe2b37eeca45975655' and '52c0efb045580dac7b6f5e40c91002e917e0cae3'
author Mark Doliner <mark@kingant.net>
date Tue, 29 Apr 2008 03:14:55 +0000
parents 8eb1846b5c40
children 3d7e9eff04d0
line wrap: on
line diff