Mercurial > pidgin
comparison libpurple/proxy.h @ 26216:9f84925079d5
merge of 'ab47b66449b213d6fbfc728cc1e8c161bed87755'
and 'd1d23cd05745079a820abdcd2310300d0be33c50'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 26 Mar 2009 05:15:04 +0000 |
parents | d25cbbea7fe5 |
children | 4c3b1bb3ba91 |
comparison
equal
deleted
inserted
replaced
26215:5e5d230f5862 | 26216:9f84925079d5 |
---|