Mercurial > pidgin
comparison libpurple/proxy.c @ 22940:b58b235d3d53
merge of '41fc76b7aed4cc32bd70c6834f747bad0b91a37b'
and '7dbbe123fdbec4e885f0b2e672ce9e2a05c305c9'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 15 May 2008 09:48:09 +0000 |
parents | 5a0186edda97 |
children | d0f933c88fc6 1c7896012802 |
comparison
equal
deleted
inserted
replaced
22939:6476a8da1937 | 22940:b58b235d3d53 |
---|