From 533c3127e1498430584d456034fe2558101d99cb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:11:02 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kdiff3plugin/kdiff3plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kdiff3plugin')

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>
-- 
cgit v1.2.1