Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 23868:55fbd01442ee
merge of '2e9b29f761a49d4b15531f9efc0c1824f50cfb0d'
and 'eb8c52d0929fb168ee42cc6e3a499067667eff8d'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Wed, 20 Aug 2008 15:57:19 +0000 |
parents | d73ad65a7d5d |
children | c87f7c6ab57c |