comparison libpurple/conversation.c @ 23969:4ecea8ae3d21

merge of '3c1dec61837db8f0f51fc35f7ca26ff948a4e4f4' and 'd03f77d92751b3104fa7f211c86084c46a8679b7'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 26 Aug 2008 04:08:22 +0000
parents abf8ebd4c9e1
children 7f552614ec8a 5ebfa814b9e8 22b8a92fb5ee
comparison
equal deleted inserted replaced
23946:169c1451b7e5 23969:4ecea8ae3d21