Mercurial > pidgin
comparison libpurple/proxy.c @ 28004:5479ffb6ec6c
merge of '89a4f914ccc668cb5ef2e9d16cf1652efb275071'
and 'eb9385f349a20856b9d3f9911dbc8024caa44052'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Wed, 19 Aug 2009 00:56:19 +0000 |
parents | 32a707746454 |
children | 30497d814cb9 |
comparison
equal
deleted
inserted
replaced
28001:584e063285b7 | 28004:5479ffb6ec6c |
---|