From 8a78e5b7a060cfd12ccbe5c9cf83b703c2b530cc Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Fri, 11 Mar 2011 18:04:44 +0000
Subject: fix up merging issues, so it compiles

---
 vcl/unx/kde/kdedata.cxx              | 2 +-
 vcl/unx/kde/salnativewidgets-kde.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'vcl/unx/kde')

diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index c7f528efba6b..b87e7a0aea5b 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_vcl.hxx"
 
 #define _SV_SALDATA_CXX
-#include <shell/kde_headers.h>
+#include <kde_headers.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 859c4502716c..bf080084ed5b 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_vcl.hxx"
 
 #define _SV_SALNATIVEWIDGETS_KDE_CXX
-#include <shell/kde_headers.h>
+#include <kde_headers.h>
 
 #include <salunx.h>
 #include <saldata.hxx>
-- 
cgit