diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
| commit | e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a (patch) | |
| tree | 9d03b385b1eca31487d5df6c0460e335bca6e663 /src/rekonq.kcfg | |
| parent | removed current bugged adblock implementation. (diff) | |
| parent | clicktoflash : more cleanup (diff) | |
| download | rekonq-e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a.tar.xz | |
Merge commit 'refs/merge-requests/2237' of git://gitorious.org/rekonq/mainline into FLASH
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/rekonq.kcfg')
| -rw-r--r-- | src/rekonq.kcfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index cc9c4317..0875342c 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -100,8 +100,8 @@ <entry name="javaEnabled" type="Bool"> <default>true</default> </entry> - <entry name="pluginsEnabled" type="Bool"> - <default>true</default> + <entry name="pluginsEnabled" type="Int"> + <default>0</default> </entry> <entry name="javascriptCanOpenWindows" type="Bool"> <default>true</default> |