summaryrefslogtreecommitdiffstats
path: root/cervisia/diffview.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
commit508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch)
tree1df40da8f05d010a3e175c3d48e3529cccf2e067 /cervisia/diffview.cpp
parent19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff)
downloadtdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz
tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/diffview.cpp')
-rw-r--r--cervisia/diffview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 83f5a1cf..481edf19 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -29,8 +29,8 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
class DiffViewItem