Mercurial > pidgin
diff libpurple/proxy.h @ 24112:fb8204e956a1
merge of '6e857412566bb470d069d3f9bfccd5e7828abd0c'
and '95a734cf399aa675f3a84219313694d419832a57'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 15 Sep 2008 03:05:11 +0000 |
parents | 67581872c47f |
children | 4670851af098 |