diff pidgin/plugins/ticker/gtkticker.c @ 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 44b4e8bd759b
children 9641c73e7f2d
line wrap: on
line diff