comparison libpurple/media.h @ 28899:bca64f4e4ce5

merge of '7c5666620054a24425f455a96975fbf6174ad8a0' and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 19 Jan 2010 06:33:18 +0000
parents 2b9983e5cb8d
children dcd52d2b1b97
comparison
equal deleted inserted replaced
28897:337ab97fa198 28899:bca64f4e4ce5