summaryrefslogtreecommitdiffstats
path: root/kdiff3plugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:50 -0600
commitdbf3ee6a200368cbe33ce33f06a1534aa5de241b (patch)
tree5a4e7bffa0a86437e9b6e099497468113e63fa96 /kdiff3plugin
parent5d58fe4201cc465d1bc54f4c9530c653af7809a8 (diff)
downloadkdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.tar.gz
kdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdiff3plugin')
-rwxr-xr-xkdiff3plugin/kdiff3plugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 3142c98..a344091 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -23,11 +23,11 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kurl.h>
#include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
//#include <iostream>