comparison libpurple/mediamanager.c @ 31173:24d62d6f72cc

merge of '4bfdb2f4a2c641b32d5e00e30482664d4ec477be' and '5aa17ddee0b82b3593aa265d48ac7d5b63375830'
author Paul Aurich <paul@darkrain42.org>
date Sun, 30 Jan 2011 17:51:40 +0000
parents 66fe4bda9a85
children 017b7ff5a894 17a4b32f4d46
comparison
equal deleted inserted replaced
31172:e89df17f5ae7 31173:24d62d6f72cc