Mercurial > pidgin
diff libpurple/proxy.h @ 28956:36dff94b1b53
merge of '557198948608028bc4f826a546a3948c4899bdf0'
and 'f34a9d45f9fd63b92e95fe69115042eadbe7c053'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 03 Feb 2010 22:02:46 +0000 |
parents | 4c3b1bb3ba91 |
children | 9a7c5d242521 |