comparison libpurple/media.h @ 26123:68ebba87143b

merge of '403c70a10f0947c6a968f38acae33715ffad2fce' and 'dca923f5c49ff1a1638b3ac1529f82d846737578'
author Marcus Lundblad <ml@update.uu.se>
date Sat, 10 Jan 2009 01:27:48 +0000
parents b93df44a5afb
children b6457b2a8e14
comparison
equal deleted inserted replaced
26095:8b54456cba97 26123:68ebba87143b