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

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

(limited to 'src/kdiff3_part.cpp')

diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp
index a97dbe8..f43381b 100644
--- a/src/kdiff3_part.cpp
+++ b/src/kdiff3_part.cpp
@@ -20,7 +20,7 @@
 #include "kdiff3_part.h"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 
-- 
cgit v1.2.3