Mercurial > pidgin
comparison libpurple/protocols/msn/object.h @ 21103:aa875e77e5ce
explicit merge of '3380c786d272dcd9ab1360f49c3e4e51227af663'
and 'c0e79d15a4fe4c5b0129fcae5060754b25f72a56'
to branch 'im.pidgin.cpw.khc.soap'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 07:39:26 +0000 |
parents | 44b4e8bd759b |
children | b65997110933 |
comparison
equal
deleted
inserted
replaced
21102:f387e8c671a4 | 21103:aa875e77e5ce |
---|