comparison libpurple/proxy.h @ 16104:f0f9d94928ee

merge of '5f2da9b1c55764e371254bcde18f34bb07edcc03' and 'a260d59abbc78e7dec2a658c8292c60e1d8dd9fe'
author Richard Nelson <wabz@pidgin.im>
date Sat, 14 Apr 2007 12:38:31 +0000
parents 32c366eeeb99
children 36b09c6f7957
comparison
equal deleted inserted replaced
16101:cbb2ee5464b4 16104:f0f9d94928ee