comparison libpurple/media.c @ 28523:a5fcfbc6f3f9

merge of '2949e994d1c2ef834be0dd1800e164e39edc880f' and 'ca2d41f7cbac42546ba0d185253fd00a5b404204'
author Paul Aurich <paul@darkrain42.org>
date Tue, 01 Sep 2009 02:54:54 +0000
parents 614a40c68b88
children bb06f05c7159 196e4c5b2043
comparison
equal deleted inserted replaced
28522:5e554e9296ac 28523:a5fcfbc6f3f9