Mercurial > pidgin
comparison libpurple/proxy.h @ 15584:9cbf44d3c0f9
merge of 'a55d39e9c7d6bfdb22fd82eaa1510ba558caa72b'
and 'ce46e38b5be321a0427deaf9295a23267ad47893'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Thu, 08 Feb 2007 12:35:14 +0000 |
parents | 5fe8042783c1 |
children | 32c366eeeb99 |
comparison
equal
deleted
inserted
replaced
15583:d91aed154695 | 15584:9cbf44d3c0f9 |
---|