[Libreoffice-commits] .: Branch 'integration/dev300_m98' - starmath/prj

[Michael Meeks]

 starmath/prj/build.lst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 63ce4ab093e7db353dbf4798a79cf8e0570cd2f4
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Mar 4 21:07:13 2011 +0000

    fix misc merge issues

diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst
index fba3e2d..1077b8b 100644
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@ -7,4 +7,5 @@ sm	starmath\sdi							nmake	-	all	sm_sdi NULL
 sm	starmath\source							nmake	-	all	sm_sorce sm_sdi sm_inc NULL
 sm	starmath\util							nmake	-	all	sm_util sm_sorce NULL
 sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
-sm	starmath\qa\cppunit						nmake	-	all sm_qa_cppunit sm_util NULL
+# FIXME: disable until we get component registration ported
+# sm	starmath\qa\cppunit						nmake	-	all sm_qa_cppunit sm_util NULL