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

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

(limited to 'kmix/mixer_oss.cpp')

diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp
index 7fcfb38e..62ab0bcc 100644
--- a/kmix/mixer_oss.cpp
+++ b/kmix/mixer_oss.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #include "mixer_oss.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
   I am using a fixed MAX_MIXDEVS #define here.
-- 
cgit v1.2.1