annotate doc/oscar/Receive_Codepaths.odg @ 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 d4ffa29eaa4f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12289
d4ffa29eaa4f [gaim-migrate @ 14593]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
1 (binary:application/octet-stream)