diff libpurple/media.h @ 31656:fcfa9e6dc88b

merge of '4beb86df935d5dfd7ce4107bcabe1944e59a63a2' and '7c414c17049558cf4b4e280a2c1a14eea7faf465'
author Mark Doliner <mark@kingant.net>
date Sun, 12 Jun 2011 09:37:15 +0000
parents a4ba3b194ce3
children 02a2e8183b1d
line wrap: on
line diff