diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:57:12 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:57:12 +0100 |
| commit | db676752e47f0d0fb562f3d46129e9066717459d (patch) | |
| tree | 1622188782b57f342e1e0c658e304c8186facb05 /testtools/prj | |
| parent | 192fc440022bf84ad3922e227e41ee9f0080b19f (diff) | |
| parent | 8c59580b88a33d7f0c892c9c53776716ad661fcf (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
testtools/prj/build.lst
Diffstat (limited to 'testtools/prj')
| -rw-r--r-- | testtools/prj/build.lst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst index c1609c6c364d..0b8f340ccff3 100644 --- a/testtools/prj/build.lst +++ b/testtools/prj/build.lst @@ -1,6 +1,6 @@ -tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi NULL +tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL tt testtools\inc nmake - all tt_inc NULL -tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs tt_inc NULL +tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl tt_inc NULL tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl tt_inc NULL |