diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /sw/qa/complex | |
parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw/qa/complex')
-rw-r--r--[-rwxr-xr-x] | sw/qa/complex/checkColor/CheckChangeColor.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | sw/qa/complex/indeterminateState/CheckIndeterminateState.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | sw/qa/complex/writer/CheckIndexedPropertyValues.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | sw/qa/complex/writer/CheckNamedPropertyValues.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | sw/qa/complex/writer/TextPortionEnumerationTest.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | sw/qa/complex/writer/testdocuments/TESTMETA.odt | bin | 8678 -> 8678 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/sw/qa/complex/checkColor/CheckChangeColor.java b/sw/qa/complex/checkColor/CheckChangeColor.java index a072072e18c8..a072072e18c8 100755..100644 --- a/sw/qa/complex/checkColor/CheckChangeColor.java +++ b/sw/qa/complex/checkColor/CheckChangeColor.java diff --git a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java index 23a6d89ccf51..23a6d89ccf51 100755..100644 --- a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java +++ b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java diff --git a/sw/qa/complex/writer/CheckIndexedPropertyValues.java b/sw/qa/complex/writer/CheckIndexedPropertyValues.java index c381cd5825c4..c381cd5825c4 100755..100644 --- a/sw/qa/complex/writer/CheckIndexedPropertyValues.java +++ b/sw/qa/complex/writer/CheckIndexedPropertyValues.java diff --git a/sw/qa/complex/writer/CheckNamedPropertyValues.java b/sw/qa/complex/writer/CheckNamedPropertyValues.java index b2541954ce9f..b2541954ce9f 100755..100644 --- a/sw/qa/complex/writer/CheckNamedPropertyValues.java +++ b/sw/qa/complex/writer/CheckNamedPropertyValues.java diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index 114359bc3581..114359bc3581 100755..100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java diff --git a/sw/qa/complex/writer/testdocuments/TESTMETA.odt b/sw/qa/complex/writer/testdocuments/TESTMETA.odt Binary files differindex 004af82e5ddf..004af82e5ddf 100755..100644 --- a/sw/qa/complex/writer/testdocuments/TESTMETA.odt +++ b/sw/qa/complex/writer/testdocuments/TESTMETA.odt |