diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 18:04:44 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 18:08:25 +0000 |
commit | 8a78e5b7a060cfd12ccbe5c9cf83b703c2b530cc (patch) | |
tree | a9cb69864c8405f28bf7948514dbdb8f1dfa2d07 /vcl/unx/kde | |
parent | 4c3acb4393a9ef9862aad0cec84426498fa7248c (diff) |
fix up merging issues, so it compiles
Diffstat (limited to 'vcl/unx/kde')
-rw-r--r-- | vcl/unx/kde/kdedata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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> |