Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/buddy.h @ 26124:46434dc43a63
merge of 'a43fe39095ee00967fa35f7fc14ecd698c4b3241'
and 'be1f71ec3369834e58cb66cfaa0ac17c03fdbe82'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sat, 10 Jan 2009 01:27:49 +0000 |
parents | 1de1494a13e5 |
children | 0e8b5b5c497a e9b7e41dc816 5dd25c58b65e 1d3274111180 45c33d60c547 4d752d07a126 |
comparison
equal
deleted
inserted
replaced
26123:68ebba87143b | 26124:46434dc43a63 |
---|