comparison libpurple/imgstore.h @ 28976:ef1c3791ad32

merge of '1042c695d02b49cb9360bb4ef591c4ff3209c5e5' and '46f6d47a97be4bbe0262771c328eda1419d62542'
author Mark Doliner <mark@kingant.net>
date Thu, 04 Feb 2010 23:03:24 +0000
parents 2f4b10ee752b
children 32e8cdf1833c
comparison
equal deleted inserted replaced
28973:d73ec122554d 28976:ef1c3791ad32