Mercurial > pidgin
comparison libpurple/ft.c @ 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 | 422889fb57e0 |
children | 1326fd4dfdc9 1e8dc177415e |
comparison
equal
deleted
inserted
replaced
30523:ee3226c6092f | 30524:6d69151fa99b |
---|