Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 24237:7ed27ecdab51
merge of '1cb1b4ee3379b50280fbc97f2c889a43cd7c8c41'
and '8a14c1d90381baa3c31adeedee7f673d58d66304'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 25 Oct 2008 18:29:21 +0000 |
parents | c87f7c6ab57c |
children | d8452c0bec7b 22b8a92fb5ee |