diff libpurple/mediamanager.h @ 29912:5f7279397ff4

merge of '5644920b69ca0205d375d023d32b16772184a02b' and 'ebc921249f91a150c6217b5b943033c7f434a27f'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 11 May 2010 20:55:13 +0000
parents 2b2b930281a0
children 02a2e8183b1d
line wrap: on
line diff