Mercurial > pidgin
diff libpurple/mediamanager.h @ 31926:ab89526a96aa
merge of '3a7408265d339b20bd3bef7b8fefc62215ccf644'
and '3bdddc2619d93c794865a2e3ebf7f03a58929381'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 22 Aug 2011 16:18:10 +0000 |
parents | 2b2b930281a0 |
children | 02a2e8183b1d |