Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 28474:708fd8138784
merge of '2c2401820569b102feeb7ce574b90abdc6406f99'
and '59016466b173fa50996ca16d6324a76c63143b12'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 28 Aug 2009 20:45:57 +0000 |
parents | 15ae2dea92b3 |
children | 63cb8c4f3c66 e57315a062cb |