summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-06-05 12:28:08 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2013-06-05 12:28:08 +0100
commit44e4ca5f05ceff06831dfac9066d35df37d7a830 (patch)
tree6b31b8b6dc1878ecc9392ded96786fbef3935e19 /desktop
parentb04acde22874bb69c5ad8eba41e73fbb39589f0e (diff)
parent4d39d4314c48e54bf14ba1edb53c82e6c6d1712e (diff)
downloadnetsurf-44e4ca5f05ceff06831dfac9066d35df37d7a830.tar.gz
netsurf-44e4ca5f05ceff06831dfac9066d35df37d7a830.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'desktop')
-rw-r--r--desktop/options.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/options.h b/desktop/options.h
index 79566184b..391dfbc08 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -56,6 +56,9 @@ NSOPTION_STRING(http_proxy_auth_user, NULL)
/** Proxy authentication password */
NSOPTION_STRING(http_proxy_auth_pass, NULL)
+/** Proxy omission list */
+NSOPTION_STRING(http_proxy_noproxy, "localhost")
+
/** Default font size / 0.1pt. */
NSOPTION_INTEGER(font_size, 128)