Mercurial > pidgin
diff libpurple/proxy.h @ 21179:e4c986ae75b1
merge of 'c37fee6ba3de411437645ccbbe48c947adee7414'
and 'fe73a4c30100b8f65013f27f2354205dc56dcc35'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Fri, 09 Nov 2007 01:41:27 +0000 |
parents | 6bf32c9e15a7 |
children | 67581872c47f |