comparison libpurple/media/candidate.c @ 32784:5aca97a40e53

merge of 'c8c73eea7431e6f940916315ace40a41c8da3faa' and 'd6a48850118c6a7c8c5f0d05b89334bc2a53d3ef'
author Ethan Blanton <elb@pidgin.im>
date Fri, 21 Oct 2011 14:38:35 +0000
parents a8cc50c2279f
children
comparison
equal deleted inserted replaced
32778:14787acaf9d7 32784:5aca97a40e53