Mercurial > pidgin.yaz
comparison libpurple/proxy.h @ 16770:0e37845d97f0
merge of '4b34ba91b3be407b1921ddbb7a7ff43a418af188'
and 'e4b381856857b16f382417e5971b9b04113e0e61'
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Tue, 01 May 2007 22:45:30 +0000 |
parents | 36b09c6f7957 |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
16764:c3e5250795ab | 16770:0e37845d97f0 |
---|