Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 16978:e13e5dd8ecb5
merge of '066f7e387d4f546f1a7c777c08743463115d89d7'
and '707317b4b82d2c54c4714cf3ddb9852f6e12ccdf'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 09 May 2007 18:49:46 +0000 |
parents | 516f14bef90e |
children | da2bab3b9fab 7790021b1270 |