diff libpurple/conversation.h @ 24335:0b6acb534f16

merge of '62e0eb23e1c2cd6ac1d8a7d96b6e598bd54ed0d2' and 'c8e0fdc8a85e96e382b7f826cfebfb1f54dcf12b'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Thu, 30 Oct 2008 03:58:20 +0000
parents c87f7c6ab57c
children d8452c0bec7b 22b8a92fb5ee
line wrap: on
line diff