summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-04 18:21:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-04 18:21:32 -0600
commitd9e53385f295f699b9f95ceda1ee40b7c8a80bdf (patch)
treed4054a31cec8f2b91dd36210764c3a3ab685727f /kcontrol
parent7c88a397842df20bee5960d7ff1eacf80a80e088 (diff)
parenta3b5ac40733523142094f6341d21945094790f51 (diff)
downloadtdebase-d9e53385f295f699b9f95ceda1ee40b7c8a80bdf.tar.gz
tdebase-d9e53385f295f699b9f95ceda1ee40b7c8a80bdf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/keys/README2
-rw-r--r--kcontrol/krdb/ad/README2
-rw-r--r--kcontrol/krdb/krdb.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/keys/README b/kcontrol/keys/README
index 14e09f73e..63964a1fe 100644
--- a/kcontrol/keys/README
+++ b/kcontrol/keys/README
@@ -1,5 +1,5 @@
CHANGES V0.2
-- Global keys stored by default in ~/.kde/share/config/kdeglobals
+- 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]
diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README
index 830ba77b4..9a5d836cb 100644
--- a/kcontrol/krdb/ad/README
+++ b/kcontrol/krdb/ad/README
@@ -39,7 +39,7 @@ $(TDEDIR)/share/apps/kdisplay/app-defaults
or
-$(HOME)/.kde/share/apps/kdisplay/app-defaults
+$(HOME)/.trinity/share/apps/kdisplay/app-defaults
so that it is available to krdb for reading. If you want to
override a system file simply copy it to your user
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 88d24f801..3b88ec5b2 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -330,7 +330,7 @@ static TQString color( const TQColor& col )
static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version )
{
- // lukas: why does it create in ~/.kde/share/config ???
+ // lukas: why does it create in ~/.trinity/share/config ???
// pfeiffer: so that we don't overwrite the user's gtkrc.
// it is found via the GTK_RC_FILES environment variable.
KSaveFile saveFile( locateLocal( "config", 2==version?"gtkrc-2.0":"gtkrc" ) );