annotate doc/oscar/On_Sending_Files_via_OSCAR.odt @ 20473:49baf4a0ae39

explicit merge of '9a7160daa1babd3ca644d25e4314310e3f24077e' and '691c4b8c8733c44a3a80e96a60b2f6963abf3fa7'
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 21 Jul 2007 23:56:16 +0000
parents 2e3eba412412
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14940
2e3eba412412 Commit a proper copy of this binary file. The old one was corrupted,
Richard Laager <rlaager@wiktel.com>
parents: 13070
diff changeset
1 (binary:application/octet-stream)