Mercurial > pidgin
comparison libpurple/media.h @ 26914:338ac8c43931
merge of '062468e9e5c7b0a7d4fb51cbd78c9a769cbd120a'
and '13f518fad2e8dacf137c733223da9b6d535c8ae1'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 19 May 2009 06:35:24 +0000 |
parents | 8b7d1aed6d59 |
children | c1687897825f |
comparison
equal
deleted
inserted
replaced
26913:56460ebd1558 | 26914:338ac8c43931 |
---|