diff libpurple/proxy.h @ 15940:fd9482f9f604

merge of '3373e976438182796e93bab7ded908eba4db04ed' and 'e8a93071ea487cda30c11aee38b1763a8fccaceb'
author Richard Nelson <wabz@pidgin.im>
date Tue, 27 Mar 2007 00:46:44 +0000
parents 32c366eeeb99
children 36b09c6f7957
line wrap: on
line diff