diff libpurple/proxy.h @ 18033:c3eb94e69ae7

merge of '0ceb1d26408290a4660e032ad5018d22ab2b9dda' and 'e0ff4c4e349a40b70347b78319d6a5211af3178b'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 02 Jun 2007 18:12:35 +0000
parents 36b09c6f7957
children 44b4e8bd759b
line wrap: on
line diff