Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 30622:d78a3f06b7a0
merge of '2e4b491ee89464d56b79db045bcef7f63fda6b97'
and 'fc7c355ab0d2fb25d82bfd4e3847128276915e28'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 15 Jun 2010 22:42:49 +0000 |
parents | dcd52d2b1b97 |
children | c0945d2291b9 6c660dc7cb6a |