comparison pidgin/gtkpounce.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 85f13e29cb40
children b948081819a6
comparison
equal deleted inserted replaced
26235:1317a9ae66e8 26236:618d122af044