comparison libpurple/mediamanager.h @ 27924:ce50e961f650

merge of '319edba55f1c66810f6a7a2af17e808a5bc75e3e' and '6ffba0724b246f1a87f83b1b19299aefcdd48142'
author Paul Aurich <paul@darkrain42.org>
date Sun, 16 Aug 2009 05:23:07 +0000
parents 317f8d7e88f1
children 8c991e09efcb
comparison
equal deleted inserted replaced
27923:df920ad8cf4f 27924:ce50e961f650