summaryrefslogtreecommitdiffstats
path: root/tdeinit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /tdeinit
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdeinit')
-rw-r--r--tdeinit/displayconfig.cpp2
-rw-r--r--tdeinit/phase1.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp
index 565e02e8..215d763e 100644
--- a/tdeinit/displayconfig.cpp
+++ b/tdeinit/displayconfig.cpp
@@ -29,7 +29,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <pwd.h>
#include <signal.h>
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 4790db56..f42d258a 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -29,7 +29,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <pwd.h>
#include <signal.h>