summaryrefslogtreecommitdiff
path: root/src/rekonq.kcfg
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-02-15 15:38:36 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-02-15 15:38:36 +0100
commit93562769c23827a1a6ddec63816ac7edbdeb98f6 (patch)
tree15d226ee3dae2da99eef768461e4e239d874be1b /src/rekonq.kcfg
parentBrowserApplication --> Application (diff)
parentPreliminary flash support (diff)
downloadrekonq-93562769c23827a1a6ddec63816ac7edbdeb98f6.tar.xz
Merge branch 'master' into mainwindow
Diffstat (limited to 'src/rekonq.kcfg')
-rw-r--r--src/rekonq.kcfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index c20134be..a1b6ca4c 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -50,7 +50,7 @@
<!-- Proxy Settings -->
<group name="Proxy">
- <entry name="enableProxy" type="Bool">
+ <entry name="isProxyEnabled" type="Bool">
<default>false</default>
</entry>
<entry name="proxyType" type="Int">