Mercurial > pidgin.yaz
comparison libpurple/proxy.c @ 30868:d487a2adc3a6
merge of '86d9ff7ca5af691007b1e85ef39959fa13e7d996'
and 'd0cbcbb1a25505fd8801dd556c1ec42e98414c9a'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 23 Aug 2010 05:22:11 +0000 |
parents | 7c871249318b |
children | 9a7c5d242521 |
comparison
equal
deleted
inserted
replaced
30856:cc75490da0e3 | 30868:d487a2adc3a6 |
---|