comparison libpurple/mediamanager.c @ 31701:ae838d29c897

merge of '3031bead50a8d359f718d5d9accd75d5e79fac7d' and '82147786072b59a286d5a14abfcf7ff7c56fbb35'
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 21 Feb 2011 22:57:05 +0000
parents 66fe4bda9a85
children 017b7ff5a894 17a4b32f4d46
comparison
equal deleted inserted replaced
31699:a3bfd9439d37 31701:ae838d29c897