comparison libpurple/mediamanager.h @ 27378:c0b4ab2f4b9f

merge of '8222e69d26359ab1a478cc42d25834120aee713b' and 'ee2ad24a7d051b291259bd2fc8ce8e57f24c0cbb'
author Paul Aurich <paul@darkrain42.org>
date Sat, 04 Jul 2009 17:19:00 +0000
parents 317f8d7e88f1
children 8c991e09efcb
comparison
equal deleted inserted replaced
27377:d4c6d2c6fb03 27378:c0b4ab2f4b9f