diff doc/oscar/On_Sending_Files_via_OSCAR.pdf @ 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 5a0f978674ad
children
line wrap: on
line diff