diff libpurple/imgstore.h @ 29628:bab8917b8b5c

merge of '60a434545c6f61fc0f20206c0d4eb87a9fb8de11' and 'fe69dfeac6d98c4a6864e937ab3d45f614d43dad'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 21 Mar 2010 20:40:17 +0000
parents 2f4b10ee752b
children 32e8cdf1833c
line wrap: on
line diff