Mercurial > pidgin
diff libpurple/conversation.h @ 23544:3ca9800a9be3
merge of '1a465eae5dc1b7bfc09b0724788403c096f461ce'
and '532937221446ba2643f5101c22ae58abc83fa1be'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 14 Jul 2008 03:04:03 +0000 |
parents | d73ad65a7d5d |
children | c87f7c6ab57c |