Mercurial > pidgin
comparison libpurple/network.c @ 22164:d1fe81e3a850
merge of '131ee6ac42d38162c4fce7a7200a0afa01aed6ce'
and '7180f1790b23a722d6c377359e36bcc7cc7cca05'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Sun, 20 Jan 2008 13:54:26 +0000 |
parents | ae58ffd5e929 |
children | 0e426ad6cc87 |
comparison
equal
deleted
inserted
replaced
22130:451b7edf79ef | 22164:d1fe81e3a850 |
---|