comparison libpurple/imgstore.c @ 21496:0df3d6b11d05

merge of '29c59c7fc04cdf75b2debfab42171f298f82c5fc' and 'd5c59d95a2f6dee5e7af2653c48c880594d8528a'
author Will Thompson <will.thompson@collabora.co.uk>
date Wed, 14 Nov 2007 12:16:30 +0000
parents 6bf32c9e15a7
children 5a85bded9ae8 0ae4d67bd6b1
comparison
equal deleted inserted replaced
21495:ea28f0c31cf3 21496:0df3d6b11d05