Mercurial > pidgin
comparison libpurple/media/codec.c @ 30396:1b7152eeea31
explicit merge of '7a18137f663908c5d0306e4d79ddb7d953386eab'
and '95cf4cb5f40dd40b28b2117b4e01692bce30ce13'
author | ivan.komarov@soc.pidgin.im |
---|---|
date | Sat, 31 Jul 2010 20:02:10 +0000 |
parents | e18c1d347e37 |
children | 1feb2baeac2d |
comparison
equal
deleted
inserted
replaced
30394:ed520e6e972b | 30396:1b7152eeea31 |
---|