comparison libpurple/mediamanager.c @ 27603:a12574d982a1

merge of '6bf1ed8cefd6bb5b980baf7501bcf6936634bd8d' and 'aff31bc617044d2074a9f5dc1c1b838061c496fd'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 13 Jul 2009 05:40:12 +0000
parents 75b473f216f2
children feb17f2b5b7a
comparison
equal deleted inserted replaced
27602:07cb59d47685 27603:a12574d982a1