diff libpurple/proxy.h @ 24735:ecbf95af2fa7

merge of '237ac12c436b96cd8e5959a16892ab9dcba4c5da' and 'b91b112c0b3cd2cc014285d5dad8b6cb8973a22b'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 15 Dec 2008 01:42:24 +0000
parents 67581872c47f
children 4670851af098
line wrap: on
line diff