Mercurial > pidgin
view doc/oscar/On_Sending_Files_via_OSCAR.odt @ 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 | 2e3eba412412 |
children |