Mercurial > pidgin.yaz
comparison libpurple/proxy.h @ 16066:b5118ddf37c2
merge of '61bd92273cfaf5b40f9f2dbedb86832dcf9ffda7'
and 'b2ab459bdd4f7d798b5581c3adc6706496153426'
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Wed, 11 Apr 2007 17:46:01 +0000 |
parents | 32c366eeeb99 |
children | 36b09c6f7957 |
comparison
equal
deleted
inserted
replaced
16064:5106ccf9f9f1 | 16066:b5118ddf37c2 |
---|