Mercurial > pidgin
comparison libpurple/protocols/myspace/user.h @ 23243:9a8d1db61062
merge of '0fb7703e7d2acc0513e238c75408f521e61f6aab'
and 'a5a6fd56ee57e35a3e26f2a66d5615248a279d45'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Thu, 29 May 2008 12:27:27 +0000 |
parents | bf4902fce6e4 |
children | 128a77f3b3c4 125cac3e24ee |
comparison
equal
deleted
inserted
replaced
23242:c85c0fc775d8 | 23243:9a8d1db61062 |
---|