comparison libpurple/mediamanager.h @ 30949:d4ec9ba82814

propagate from branch 'im.pidgin.pidgin' (head 23403faa17b752c8e88650199945fbd8843f3796) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head ed29df60be204b4d77335d8f8c5afc1fcee6d457)
author Marcus Lundblad <ml@update.uu.se>
date Thu, 10 Dec 2009 21:36:41 +0000
parents 713987ae3215
children 2b2b930281a0
comparison
equal deleted inserted replaced
29163:6921cc1e704b 30949:d4ec9ba82814