diff libpurple/conversation.h @ 19278:9a8bb33fc60a

merge of 'c6cd7cce984b6e47dfbce5041ac4bd47a1267e05' and 'fe19bc6b502b24b00a8fb3c3560dcb3171bd29d1'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 17 Aug 2007 01:54:19 +0000
parents d57926990768
children deb9471d7142
line wrap: on
line diff