diff libpurple/protocols/yahoo/yahoo_picture.c @ 26154: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 25975a6a5b63
children 0044b8f3727a
line wrap: on
line diff