diff libpurple/protocols/yahoo/util.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 bf7ce9629402
children 18a1f0fe5f40
line wrap: on
line diff