Mercurial > pidgin.yaz
diff libpurple/mediamanager.c @ 26700:c0ab14a1e43a
merge of '580055bb22fea0076d3a90d9df9346abd1789bab'
and 'fade006b4836b4f79bfcbf8d5be330408eda6273'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 17 Apr 2009 21:29:18 +0000 |
parents | 75b473f216f2 |
children | feb17f2b5b7a |