comparison libpurple/mediamanager.h @ 28380:5550823608cb

merge of '5fc198b7a02aacaaa8a7045d9df437c2d0e9006b' and '667654b3309008b53bf4d9df02bd401d1ede8db5'
author Paul Aurich <paul@darkrain42.org>
date Tue, 13 Oct 2009 19:52:35 +0000
parents 713987ae3215
children 2b2b930281a0
comparison
equal deleted inserted replaced
28375:e191f5fedce1 28380:5550823608cb