comparison libpurple/mediamanager.h @ 30096:8de1ce16087c

merge of '1f6b3e2158dd96486ec32995b3f4f93d6b376780' and '84c7f6ba2f4be4be1e1698201fae77872ac21fee'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 26 May 2010 13:50:08 +0000
parents 2b2b930281a0
children 02a2e8183b1d
comparison
equal deleted inserted replaced
30093:2152d97d145f 30096:8de1ce16087c