Mercurial > pidgin
comparison libpurple/media.c @ 32356:08151b40c598
merge of '071d7e809e0a4532e6dc367a6f05ea43e1ab0de0'
and 'f7828c5032d27f14c4543fe56ed1b5cecb5517f7'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 07 Nov 2011 02:07:59 +0000 |
parents | a4ba3b194ce3 |
children | b0ec02a9f558 |
comparison
equal
deleted
inserted
replaced
32354:ec6371d4cae8 | 32356:08151b40c598 |
---|