Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 0 deletions

diff --git a/kcontrol/keys/ChangeLog b/kcontrol/keys/ChangeLog
new file mode 100644
index 000000000..b8ef570df
--- /dev/null
+++ b/kcontrol/keys/ChangeLog
@@ -0,0 +1,26 @@
+1999-08-19 Duncan Haldane <duncan@kde.org>
+	* removed left-over commented out code from change
+	decribed below, and adjusted help doc names to
+	index-1.html
+
+1999-02-28 Duncan Haldane <duncan@kde.org>
+	* commented out those unnecessary debug calls.
+	in keyconfig.cpp 
+	
+1998-12-19 Duncan Haldane <f.d.m.haldane@cwix.com>
+	* Converted global.cpp, global.h to keyconfig.cpp,
+	keyconfig.h, that can now be used to configure both
+	the standard keys  and the global keys 
+	in the same sophisticated manner as  
+	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)
+	* appropriate changes to Makefile.am.
+	* standard key binding are now #include'd from
+	stdbindings.cpp
+        *  standard.cpp, standard.h are left here for now.
+	The entries that used to use them in main.cpp and
+	Makefile.am are just commented out for now.
+	
\ No newline at end of file