Mercurial > pidgin
comparison libpurple/proxy.c @ 26379:cdce3db4e09f
merge of '09e919e395cff260ab58aee3aec04058c5f128b9'
and '19dc1175b3648701e3d873038fbd2bb955afea8f'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 30 Mar 2009 04:15:52 +0000 |
| parents | 4b8c4870b13a |
| children | 4c3b1bb3ba91 |
comparison
equal
deleted
inserted
replaced
| 26378:e9e9ec08e87c | 26379:cdce3db4e09f |
|---|
