diff libpurple/conversation.h @ 21666:d804f5b656cd

merge of '58c35aec5c3cdd46ab59070b5e659782d73d8001' and 'ee39fe2d2bc694cf58bd99f447589b8e19da8c66'
author Ethan Blanton <elb@pidgin.im>
date Tue, 27 Nov 2007 15:57:03 +0000
parents 6de09629f091
children 8eb1846b5c40
line wrap: on
line diff