Mercurial > pidgin.yaz
comparison libpurple/proxy.h @ 19905:c5e55b596d1e
explicit merge of '340d730b1b1e1164ee9eab77968ffd03cdf4996e'
and '3d09514342c28c798103b050651727e19709c903'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Sat, 01 Dec 2007 01:48:26 +0000 |
parents | 36b09c6f7957 |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
19904:bea1d9075c7e | 19905:c5e55b596d1e |
---|