diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
| commit | 8c59580b88a33d7f0c892c9c53776716ad661fcf (patch) | |
| tree | da43a9c8f3ba7cba7afca05894acc8712f6e36ce /testgraphical | |
| parent | e62f74cabe9558e003d3105df7a69e3841dfc9ce (diff) | |
| parent | 36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts:
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/smoketest.cxx
test/source/cpp/getargument.cxx
test/source/cpp/officeconnection.cxx
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
testautomation/framework/optional/includes/filedlg_cjk_folders.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/e_all.sid
testautomation/global/win/bars.win
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/testComponent.component
Diffstat (limited to 'testgraphical')
| -rwxr-xr-x | testgraphical/prj/build.lst | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | testgraphical/prj/d.lst | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testgraphical/prj/build.lst b/testgraphical/prj/build.lst index 45fb77fd81ec..75878a6d9dd8 100755 --- a/testgraphical/prj/build.lst +++ b/testgraphical/prj/build.lst @@ -1,7 +1,7 @@ -gfxcmp testgraphical : instsetoo_native NULL +gfxcmp testgraphical : instsetoo_native qadevOOo NULL gfxcmp testgraphical usr1 - all gfxcmp_mkout NULL #gfxcmp testgraphical\prechecks nmake - all gfxcmp_pre NULL gfxcmp testgraphical\ui\java\ConvwatchGUIProject nmake - all gfxcmp_java_ui NULL gfxcmp testgraphical\ui\java nmake - all gfxcmp_java gfxcmp_java_ui NULL # gfxcmp testgraphical\source nmake - all gfxcmp_src gfxcmp_java NULL -gfxcmp testgraphical\qa\graphical nmake - all gfxcmp_qa gfxcmp_java NULL +#i112751 gfxcmp testgraphical\qa\graphical nmake - all gfxcmp_qa gfxcmp_java NULL diff --git a/testgraphical/prj/d.lst b/testgraphical/prj/d.lst index e69de29bb2d1..e69de29bb2d1 100755..100644 --- a/testgraphical/prj/d.lst +++ b/testgraphical/prj/d.lst |