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

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

(limited to 'src/entrymerger.cpp')

diff --git a/src/entrymerger.cpp b/src/entrymerger.cpp
index abe4998..62de6c1 100644
--- a/src/entrymerger.cpp
+++ b/src/entrymerger.cpp
@@ -20,7 +20,7 @@
 #include "statusbar.h"
 #include "tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
-- 
cgit v1.2.3