Mercurial > pidgin
changeset 28158:02c62c9ad822
merge of '72c558ad4f7ad4f6c3ef1347e9d202cebdfaed83'
and 'eb7f43240a9076b19941ad012cb5b9046f5cd0ce'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 31 Aug 2009 20:07:36 +0000 |
| parents | 7f447db0e03b (current diff) 86e6df9a0c80 (diff) |
| children | 087ad09cd4f5 |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Aug 31 20:06:36 2009 +0000 +++ b/ChangeLog Mon Aug 31 20:07:36 2009 +0000 @@ -19,6 +19,11 @@ the form "room@conference.example.net/User", where room@conference.example.net is a MUC. + Yahoo!/Yahoo! JAPAN: + * Accounts now have "Use account proxy for SSL connections" option. This + option force-overrides the account specific proxy settings for SSL + connections only and instead uses the global proxy configuration. + Finch: * Properly detect libpanel on OpenBSD. (Brad Smith) * Remove IO watches in gnt_quit. (Tomasz Mon)