comparison libpurple/conversation.c @ 24112:fb8204e956a1

merge of '6e857412566bb470d069d3f9bfccd5e7828abd0c' and '95a734cf399aa675f3a84219313694d419832a57'
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 15 Sep 2008 03:05:11 +0000
parents abf8ebd4c9e1
children 7f552614ec8a 5ebfa814b9e8 22b8a92fb5ee
comparison
equal deleted inserted replaced
24111:a3ac735ae75b 24112:fb8204e956a1