Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/switchboard.c @ 21104:d31843a6b3bb
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 08:13:42 +0000 |
parents | c8f99cb61dc9 |
children | 23fef20a0ef2 bc47a0388c66 |
comparison
equal
deleted
inserted
replaced
21102:f387e8c671a4 | 21104:d31843a6b3bb |
---|