summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-04-19 12:51:39 -0500
committerTimothy Pearson <[email protected]>2013-04-19 12:51:39 -0500
commitb8ed19a4c246bf279217c6f6e8abc8ed26a6a973 (patch)
treedb7ccf39acfa1795dea0b325ec20b53051773fa9 /kcontrol/keys
parent5f4287e56dd5c1feecc08843aae1d4e4b8835d1e (diff)
parent3dacd27ea08799f126c00fc93358e0b3961a3b1a (diff)
downloadtdebase-b8ed19a4c246bf279217c6f6e8abc8ed26a6a973.tar.gz
tdebase-b8ed19a4c246bf279217c6f6e8abc8ed26a6a973.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/keys')
-rw-r--r--kcontrol/keys/README2
1 files changed, 1 insertions, 1 deletions
diff --git a/kcontrol/keys/README b/kcontrol/keys/README
index 63964a1fe..bbdc72537 100644
--- a/kcontrol/keys/README
+++ b/kcontrol/keys/README
@@ -2,6 +2,6 @@ CHANGES V0.2
- Global keys stored by default in ~/.trinity/share/config/kdeglobals
[Global Keys] group
- KKeyDialog checks new key choices against exising bindings for the widget
-and against entries in .kderc [Global Keys]
+and against entries in .tderc [Global Keys]
- kcmkeys now has two standard kcontrol pages - one for standard desktop
accelerators and one for global keybindings.