comparison libpurple/protocols/yahoo/yahoo_filexfer.h @ 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 118046227581
children 7b88cc6c3f7a
comparison
equal deleted inserted replaced
26153:1317a9ae66e8 26154:618d122af044