Mercurial > pidgin
comparison libpurple/media-gst.h @ 31781:ac43f26c7f61
merge of '269c6e29c67a1c066871499e76575d4700bf6744'
and 'f456e895f18adad6c0e3178c99a73f6fbd439487'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Thu, 11 Aug 2011 14:44:44 +0000 |
parents | 55e30c0eca22 |
children | 02a2e8183b1d |
comparison
equal
deleted
inserted
replaced
31780:db4e78a1f46b | 31781:ac43f26c7f61 |
---|