annotate doc/oscar/On_Sending_Files_via_OSCAR.odt @ 30518:090e141a5214

Some merge-resolving...
author Marcus Lundblad <ml@update.uu.se>
date Fri, 08 Jan 2010 23:33:44 +0000
parents 2e3eba412412
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15938
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)