comparison libpurple/media.h @ 27280:660cf341992f

merge of 'b6e009fb9284f653ac58c5309b5443eec6f12c8e' and 'dbb1a72f8c673c57a1b03e941c52cc371c73641e'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 04 Jul 2009 01:16:21 +0000
parents 8b7d1aed6d59
children c1687897825f
comparison
equal deleted inserted replaced
27279:fe242dec0d50 27280:660cf341992f