diff libpurple/proxy.h @ 21774:b63b2a5c2d05

merge of '282b4acb46729e4358221cb7cc78ad9373289199' and '3fe64d635336a6d7f6e520f4b2e041c3316c465d'
author Etan Reisner <pidgin@unreliablesource.net>
date Sat, 01 Dec 2007 03:41:37 +0000
parents 6bf32c9e15a7
children 67581872c47f
line wrap: on
line diff