comparison README @ 30524: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 56042b2f8b64
children
comparison
equal deleted inserted replaced
30523:ee3226c6092f 30524:6d69151fa99b