comparison libpurple/proxy.h @ 26824:a780680f090d

merge of '4a2d7c0b8570558cada900f60d7696231954c231' and 'e97dfd6e35de719fe7bffabef680c282f4702341'
author Ka-Hing Cheung <khc@hxbc.us>
date Tue, 28 Apr 2009 22:21:10 +0000
parents d25cbbea7fe5
children 4c3b1bb3ba91
comparison
equal deleted inserted replaced
26823:73ac2cd2cba3 26824:a780680f090d