diff libpurple/media.h @ 28784:ebba905f1971

merge of '23403faa17b752c8e88650199945fbd8843f3796' and 'a7ad73861fcd2493b36ea5341495c336c5cfcc33'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 10 Dec 2009 22:10:01 +0000
parents 713987ae3215
children 2b9983e5cb8d c52dbc5503d0
line wrap: on
line diff