comparison libpurple/conversation.h @ 28606:b6cc239e2564

merge of '4bf270f4acb1ba37f3a3aa264be813d4b16878ed' and '97e003ed2bc2bafbb993693c9ae9c6d667731cc1'
author Marcus Lundblad <ml@update.uu.se>
date Mon, 07 Sep 2009 19:33:39 +0000
parents 63cb8c4f3c66
children b0f0b7a8105a fba8dd643796
comparison
equal deleted inserted replaced
28605:f200f7628962 28606:b6cc239e2564