Mercurial > pidgin
diff libpurple/proxy.h @ 21586:948e5c7a558f
merge of '28981c935948f2d4e944f786a01e16ecadfd4848'
and 'd5a86b73860f0521df192aa72f0c8947f1ad1b38'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 19 Nov 2007 03:10:41 +0000 |
parents | 6bf32c9e15a7 |
children | 67581872c47f |