┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
authorLuca Beltrame <[email protected]>2012-09-21 10:55:08 +0200
committerLuca Beltrame <[email protected]>2012-09-21 10:55:08 +0200
commitf1b822d926316d739ec10d8b05917b6b0c2d92b5 (patch)
tree20e52bfd70694a34f86fa650d3797be67bda8f67 /src/settings
parent399c4b22ea9947047c7d2777d7f361df6b5e9636 (diff)
parentc8243401470156d9ee76e2015a23741570d3dba1 (diff)
Merge branch 'KDE/4.9'
Conflicts: konq-plugins/dirfilter/dirfilterplugin.cpp konq-plugins/dirfilter/dirfilterplugin.h
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/dolphin_generalsettings.kcfg4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 9f261dc5f..050750199 100644
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -52,6 +52,10 @@
<label>Ask for confirmation when closing windows with multiple tabs.</label>
<default>true</default>
</entry>
+ <entry name="RenameInline" type="Bool">
+ <label>Rename inline</label>
+ <default>true</default>
+ </entry>
<entry name="ShowSelectionToggle" type="Bool">
<label>Show selection toggle</label>
<default>true</default>