diff options
author | Marius Kintel <marius@kintel.net> | 2013-06-02 22:15:37 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2013-06-02 22:15:37 (GMT) |
commit | 85c83fbc04f4918159a598793cee47cdafabf8c4 (patch) | |
tree | d79d2c7d954424dd2354a16560b693351193d35b /tests/regression/csgtexttest | |
parent | 40ad09637974f840ea4bdd3b7b27e2f5d7388c5b (diff) | |
parent | 41f352a7888aebfffd96b0e764e29b3f0cbf01fa (diff) |
Merge branch 'master' into issue181
Diffstat (limited to 'tests/regression/csgtexttest')
-rw-r--r-- | tests/regression/csgtexttest/allexpressions-expected.txt | 1 | ||||
-rw-r--r-- | tests/regression/csgtexttest/allmodules-expected.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/regression/csgtexttest/allexpressions-expected.txt b/tests/regression/csgtexttest/allexpressions-expected.txt new file mode 100644 index 0000000..331822f --- /dev/null +++ b/tests/regression/csgtexttest/allexpressions-expected.txt @@ -0,0 +1 @@ +group1 diff --git a/tests/regression/csgtexttest/allmodules-expected.txt b/tests/regression/csgtexttest/allmodules-expected.txt index 49171ba..95e0029 100644 --- a/tests/regression/csgtexttest/allmodules-expected.txt +++ b/tests/regression/csgtexttest/allmodules-expected.txt @@ -1 +1 @@ -group1(minkowski2+glide3+subdiv4+hull5+group6+group6+group6+intersection9+group6+union11+difference12+intersection9+linear_extrude+linear_extrude+rotate_extrude+rotate_extrude+import+import+import+import+group6+cube+sphere+cylinder+polyhedron+square+circle+polygon+projection+render31+surface+transform33+transform33+transform35+transform33+transform33+color38) +group1(minkowski2+glide3+subdiv4+hull5+resize6+group7+group7+group7+intersection10+group11(sphere)+union13+difference14+intersection10+linear_extrude+linear_extrude+rotate_extrude+rotate_extrude+import+import+import+import+group7+cube+sphere+cylinder+polyhedron+square+circle+polygon+projection+render33+surface+transform35+transform35+transform37+transform35+transform35+color40) |