comparison libpurple/media.c @ 28032:ab0dace4c688

merge of '676252faa4180c3a4995644d57dd0394f55d5db7' and '9b3deec2188b0d6cd5015cc06c8de2f7d5696a59'
author Paul Aurich <paul@darkrain42.org>
date Mon, 27 Jul 2009 03:33:32 +0000
parents 5a4451b8fe29
children 60aab59fb35a
comparison
equal deleted inserted replaced
28031:02dd3b637d66 28032:ab0dace4c688