Mercurial > pidgin
comparison libpurple/mime.h @ 30522:0f6ef3b21e17
merge of '4e5f78559deacc45eb458cdbe7ffc96491ab11bd'
and '97f70a97fe41a0319d0041706ffaf3a6e4f0367d'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:42:20 +0000 |
parents | 0c796a1950b7 |
children | 98520ee78f12 |
comparison
equal
deleted
inserted
replaced
30521:48f70e888c04 | 30522:0f6ef3b21e17 |
---|