diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:48:05 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:48:05 +0200 |
| commit | fdb19d3c0480a572803fc59808b9bf40e8758c7d (patch) | |
| tree | b4b37f5e9e3cb58ee08c824fedcdb1da2b8e7350 /starmath/CppunitTest_starmath_qa_cppunit.mk | |
| parent | 0a178da6d60e28baad04fa40a8ff1cba707d984d (diff) | |
| parent | 42f7df050243d48e10e45e059ccf8e663a8ce0bd (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
starmath/qa/cppunit/makefile.mk
sw/source/core/layout/fly.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/ui/inc/view.hxx
sw/source/ui/shells/grfsh.cxx
Diffstat (limited to 'starmath/CppunitTest_starmath_qa_cppunit.mk')
| -rw-r--r-- | starmath/CppunitTest_starmath_qa_cppunit.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 2d03bbb01a31..0f4606a2064e 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -97,10 +97,10 @@ $(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\ )) $(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ + component/vcl/vcl \ configmgr \ i18npool \ mcnttype \ - vcl \ )) ifeq ($(strip $(OS)),WNT) |