comparison libpurple/imgstore.c @ 24117:b19a3458e6b2

merge of '59e2b9896f25e8517b3f0f4d742c143e6fccd6e0' and 'c2b5d965f04a15ae8caa5262870b9feae90390d9'
author Marcus Lundblad <ml@update.uu.se>
date Thu, 25 Sep 2008 04:51:19 +0000
parents 2f4b10ee752b
children 1643ace55ef8
comparison
equal deleted inserted replaced
24115:9564593d170c 24117:b19a3458e6b2