comparison libpurple/mediamanager.h @ 26847:12c45d148c32

merge of 'df25bed2c1c0d097b7f52fbfae76223d8552f0c3' and 'f16d13c3e5a15443b2bfb4f84c34e9b9a8e28850'
author Paul Aurich <paul@darkrain42.org>
date Fri, 08 May 2009 02:42:13 +0000
parents 317f8d7e88f1
children 8c991e09efcb
comparison
equal deleted inserted replaced
26844:2760311c492a 26847:12c45d148c32