diff libpurple/conversation.h @ 23723:0bdff80233fb

merge of '87f91e5f4e7f627329c2b7edf56773f58696a8cf' and 'f1507f3c6fa748de84c1961d2b1182ce21308d77'
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 14 Aug 2008 04:32:39 +0000
parents d73ad65a7d5d
children c87f7c6ab57c
line wrap: on
line diff