diff libpurple/conversation.h @ 25922:d03177395ae0

merge of '7dc734d96688ae822246be79196106858b5e6670' and 'ca41f163a139123ff8ac7752424944338396520f'
author Peter Hjalmarsson <xake@rymdraket.net>
date Wed, 25 Feb 2009 22:59:41 +0000
parents d8452c0bec7b
children 584063555949 9ea6842536ba
line wrap: on
line diff