view HACKING @ 26161:90ffe6f71fa9

clearing conflicts while merging from im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Tue, 20 Jan 2009 17:11:35 +0000
parents d73ee2690376
children
line wrap: on
line source

For information on hacking on Pidgin, Finch, or libpurple, see:
	http://developer.pidgin.im