comparison libpurple/conversation.h @ 27759:1a6c2144ba08

merge of 'a6c4b3ed3fdfcd5eafd45342656fed541020f353' and 'ae28e0b0bf4488cc755ccad2b98841440ad6fe70'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 31 Jul 2009 04:09:41 +0000
parents 15ae2dea92b3
children 63cb8c4f3c66 e57315a062cb
comparison
equal deleted inserted replaced
27758:6c4e816873f7 27759:1a6c2144ba08