comparison doc/oscar/On_Sending_Files_via_OSCAR.odt @ 22636:7a68335d1086

merge of '37d6f8af593bffa17bba1823a3c5a8612bcfdf18' and '6f293106dd16191e1ee2fd0ae94ab626d6753c98'
author Ethan Blanton <elb@pidgin.im>
date Sat, 12 Apr 2008 20:20:09 +0000
parents 2e3eba412412
children
comparison
equal deleted inserted replaced
22632:bc9845b6f9c0 22636:7a68335d1086