comparison libpurple/proxy.c @ 15556:0c61cd8e5898

merge of '0cdb5a41899b72694b4b3e0d18af5185cec3dc30' and '3ed56e9c270c468fd082f614356c1bdb7f420f56'
author Sean Egan <seanegan@gmail.com>
date Sun, 04 Feb 2007 21:14:41 +0000
parents 0d4890637238
children 14d85ee22d78
comparison
equal deleted inserted replaced
15554:d5242ff0708b 15556:0c61cd8e5898