comparison pidgin/gtkconvwin.h @ 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 c0ad0943cd6e
children a8a26b4d8458 22b8a92fb5ee
comparison
equal deleted inserted replaced
26235:1317a9ae66e8 26236:618d122af044