diff libpurple/imgstore.h @ 26236:618d122af044

resolving conflict - merging im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Wed, 12 Nov 2008 10:17:38 +0000
parents 2f4b10ee752b
children 32e8cdf1833c
line wrap: on
line diff