Mercurial > pidgin.yaz
comparison libpurple/proxy.h @ 30751:e9fbbfe1ab70
merge of '5b9ae21a0927d9a160964bfb1cad7a43253fba0d'
and '874c07e0346e899fe81f0ecd50471f478e1161c9'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 31 Jul 2010 23:43:37 +0000 |
parents | 4c3b1bb3ba91 |
children | 9a7c5d242521 |
comparison
equal
deleted
inserted
replaced
30749:76049fde7ad2 | 30751:e9fbbfe1ab70 |
---|