view HACKING @ 21106:95684692f622

fix up bad merge the bad way
author Ka-Hing Cheung <khc@hxbc.us>
date Thu, 25 Oct 2007 08:32:44 +0000 (2007-10-25)
parents d73ee2690376
children
line wrap: on
line source
For information on hacking on Pidgin, Finch, or libpurple, see:
	http://developer.pidgin.im