From dbf3ee6a200368cbe33ce33f06a1534aa5de241b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:45:50 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 src/mergeresultwindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mergeresultwindow.cpp')

diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
index 760d794..f52d0a3 100644
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -34,8 +34,8 @@
 #include <tqtextcodec.h>
 #include <tqdragobject.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <iostream>
 
 int g_bAutoSolve = true;
-- 
cgit v1.2.3