comparison libpurple/mediamanager.c @ 28648:1a4b6f47258c

merge of '5e1784d5a975dc0726e72521fbf6024dfa281d84' and 'e28bbfa3c8184843c6f30c7fe26da08ade3873c2'
author Paul Aurich <paul@darkrain42.org>
date Fri, 27 Nov 2009 07:13:38 +0000
parents 8c991e09efcb
children e144a461cf3c
comparison
equal deleted inserted replaced
28647:f1437342cc0e 28648:1a4b6f47258c