comparison libpurple/protocols/msnp9/user.h @ 28243:b6cc239e2564

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