summaryrefslogtreecommitdiffstats
path: root/kdiff3plugin/kdiff3plugin.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:11:02 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:11:02 -0600
commit533c3127e1498430584d456034fe2558101d99cb (patch)
treec65bb79b9fe98e34fbdca81ae843289fd47d14f0 /kdiff3plugin/kdiff3plugin.cpp
parent821dbb340f650965ff257f4dec7b31ed7458c6e1 (diff)
downloadkdiff3-533c3127e1498430584d456034fe2558101d99cb.tar.gz
kdiff3-533c3127e1498430584d456034fe2558101d99cb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kdiff3plugin/kdiff3plugin.cpp')
-rwxr-xr-xkdiff3plugin/kdiff3plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 21f171c..14442cb 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -22,7 +22,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kgenericfactory.h>
#include <kurl.h>