Mercurial > pidgin.yaz
diff libpurple/proxy.h @ 21689:882ac6616de9
merge of '29f8aed19e209a53a63c57cf872bc9f446d84aeb'
and '680ead8ac23fbdc99bd7178248a4cdf0bec54307'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Thu, 29 Nov 2007 23:18:51 +0000 |
parents | 6bf32c9e15a7 |
children | 67581872c47f |