diff libpurple/protocols/yahoo/yahoo_friend.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 3b19ea3c8165
children 74bb0836f164
line wrap: on
line diff