comparison libpurple/mediamanager.h @ 27654:7e473a437c7f

merge of '1ce56b5da0a32c13c50761b20f87a319cc55306f' and '634c9cc535f126dc9579bb5f790e77356d55261a'
author Ka-Hing Cheung <khc@hxbc.us>
date Tue, 21 Jul 2009 04:25:59 +0000
parents 317f8d7e88f1
children 8c991e09efcb
comparison
equal deleted inserted replaced
27653:d0c789608f0c 27654:7e473a437c7f