annotate doc/oscar/On_Sending_Files_via_OSCAR.odt @ 30957:6d69151fa99b

Merge fix. There is still a change lost that should be re-introduced in libpurple/media
author Marcus Lundblad <ml@update.uu.se>
date Thu, 18 Feb 2010 22:20:06 +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)