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 /padmin | |
| 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 'padmin')
| -rw-r--r-- | padmin/Executable_spadmin.bin.mk | 1 | ||||
| -rw-r--r-- | padmin/Library_spa.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 5f958d406965..bcb69b28e748 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ cppuhelper \ cppu \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 82b3e4e8a45d..3cd9dc7c271e 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,spa,\ i18nisolang1 \ cppu \ sal \ + $(gb_STDLIBS) \ )) |