Mercurial > pidgin
comparison libpurple/proxy.h @ 28776:e2ba2a8814c1
merge of 'f31da20f593d64a906374f7963e178dcd1738ac3'
and 'f39cd1fed08fe5f5e3165a087fcc36ed984a6eee'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 08 Dec 2009 17:24:33 +0000 |
parents | 4c3b1bb3ba91 |
children | 9a7c5d242521 |
comparison
equal
deleted
inserted
replaced
28775:be02d04d2fee | 28776:e2ba2a8814c1 |
---|