comparison libpurple/media.c @ 28438:80265d67fc7e

merge of '92e101e3698042e7600729bc09dec9e28f81de8f' and '930d76b5c3f7e4eacec86cd7b8153fc8299a5bb3'
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Mon, 24 Aug 2009 20:43:09 +0000
parents afa79877d972
children 0775b7b7298e
comparison
equal deleted inserted replaced
28437:30497d814cb9 28438:80265d67fc7e