Mercurial > pidgin
comparison libpurple/proxy.h @ 19386:31d1143ac9ed
merge of '64a21ba142d57ec69f4b25cf89b5e725ff2a4752'
and 'b5e04374f6f6b3a7543c52514185b6d46e12bd7c'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Thu, 23 Aug 2007 20:55:59 +0000 |
parents | 36b09c6f7957 |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
19385:3bc55836f621 | 19386:31d1143ac9ed |
---|