Mercurial > pidgin
comparison libpurple/media.h @ 27760:ae86b03162aa
merge of 'a20a45414d71cd9c0ab697cf0d6209bea8d9140c'
and 'cde2d2ed1c69105e71b77c426cb80f3281163065'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Fri, 31 Jul 2009 04:21:28 +0000 |
parents | 8b7d1aed6d59 |
children | c1687897825f |
comparison
equal
deleted
inserted
replaced
27759:1a6c2144ba08 | 27760:ae86b03162aa |
---|