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/source/src/btntext.src | |
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/source/src/btntext.src')
-rw-r--r-- | vcl/source/src/btntext.src | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 181650b24ce8..c0303aac0f1f 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -27,9 +27,7 @@ #define _SV_BTNTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_BUTTONTEXT_OK { |