Mercurial > pidgin.yaz
diff libpurple/proxy.h @ 31767:a01d958f7b26
merge of '27d803c1a7d7bd1907e87fba4a7937a44389dd80'
and 'ad6f772bb86f527497f77c40386497f461bcf3a5'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Thu, 10 Mar 2011 03:18:45 +0000 |
parents | 4c3b1bb3ba91 |
children | 9a7c5d242521 |