comparison libpurple/proxy.h @ 26851:6bc0e4e76207

merge of '9df36977fc8f70d1b3124d32a54eb123df50aa0f' and 'f92d95c83baba97463f923077688ba2eb144763b'
author Peter Hjalmarsson <xake@rymdraket.net>
date Fri, 01 May 2009 21:36:29 +0000
parents d25cbbea7fe5
children 4c3b1bb3ba91
comparison
equal deleted inserted replaced
26270:15911f71e37f 26851:6bc0e4e76207