diff libpurple/media.h @ 27957:cfefc9bd2acc

merge of '455ee39cd9ae508a675deeaa3952b91d404ca64d' and '8ee76f2f5b656f5452cf284b76a5f8863d52d8e0'
author Paul Aurich <paul@darkrain42.org>
date Tue, 18 Aug 2009 18:29:55 +0000
parents c1687897825f
children 8c991e09efcb
line wrap: on
line diff