diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
| commit | 9e5584a82633442467a53ccc08c3380070178a38 (patch) | |
| tree | 03ecad6d69523ff70217dd583ac757500135697d /vcl/unx/kde4/KDESalFrame.cxx | |
| parent | 9d4ec37cb09142515a5bc1fdc06beee1f8b0642a (diff) | |
| parent | 73b79fe869dee44b26d79d9e448fa95544a375e7 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
i18npool/inc/i18npool/lang.h
i18npool/source/isolang/isolang.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/graphic/grfmgr.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/sft.hxx
vcl/inc/unx/pspgraphics.h
vcl/inc/vcl/cursor.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/prj/d.lst
vcl/source/app/settings.cxx
vcl/source/control/edit.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/window/cursor.cxx
vcl/source/window/window.cxx
vcl/unx/generic/fontmanager/fontconfig.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'vcl/unx/kde4/KDESalFrame.cxx')
| -rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index a2f4b72b4edd..98b84ce54d7a 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -45,13 +45,14 @@ #include "KDEXLib.hxx" #include "KDESalGraphics.hxx" +#include <tools/color.hxx> + #include <vcl/settings.hxx> #include <vcl/font.hxx> -#include <tools/color.hxx> -#include <vcl/svdata.hxx> +#include <svdata.hxx> -#include <pspgraphics.h> +#include <unx/pspgraphics.h> #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> |