summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys/ChangeLog
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/keys/ChangeLog
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/keys/ChangeLog')
-rw-r--r--kcontrol/keys/ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/keys/ChangeLog b/kcontrol/keys/ChangeLog
index b8ef570df..da787a8c6 100644
--- a/kcontrol/keys/ChangeLog
+++ b/kcontrol/keys/ChangeLog
@@ -15,8 +15,8 @@
global.cpp did for just the global keys.
* converted main.cpp to use keyconfig.cpp rather than
global.cpp and standard.cpp for standard and globall
- key configuration. KGlobalConfig and KStdConfig disappear.
- (KGlobalConfig is renamed to KKeyConfig)
+ key configuration. TDEGlobalConfig and KStdConfig disappear.
+ (TDEGlobalConfig is renamed to KKeyConfig)
* appropriate changes to Makefile.am.
* standard key binding are now #include'd from
stdbindings.cpp