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_shell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/kdiff3_shell.cpp')

diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp
index 287a9b3..8bcc460 100644
--- a/src/kdiff3_shell.cpp
+++ b/src/kdiff3_shell.cpp
@@ -27,7 +27,7 @@
 
 #include <kedittoolbar.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <klibloader.h>
-- 
cgit v1.2.3