comparison libpurple/mediamanager.c @ 28385:d5ff2cd6064a

merge of '0ff7fb50305f33b84a373ff00a085c25175515c1' and 'af00ae634db8d99b296a90e1e0777bd23bd4df6a'
author Paul Aurich <paul@darkrain42.org>
date Thu, 15 Oct 2009 16:13:57 +0000
parents 8c991e09efcb
children e144a461cf3c
comparison
equal deleted inserted replaced
28382:ef513141e960 28385:d5ff2cd6064a