diff pidgin/pidginstock.h @ 26238:3e788c0db3a6

resolved conflict -- merged im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Wed, 12 Nov 2008 10:23:13 +0000
parents b948081819a6
children 051c29d275de adf153852bcf d855ff9cf839
line wrap: on
line diff