Mercurial > pidgin
comparison libpurple/proxy.c @ 29518:f33da955a815
merge of '35c36f4798530acf3c07ab0acf0c5e7af98c0f48'
and 'c94e3f15ffb8d4f569d41661e7a89c1c441947ce'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 03 Mar 2010 22:08:35 +0000 |
parents | 0257b8fe21d6 |
children | 9e60e300541a |
comparison
equal
deleted
inserted
replaced
29517:6bcf405d5c63 | 29518:f33da955a815 |
---|