diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-12-15 21:32:06 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-12-15 21:32:06 (GMT) |
| commit | 3b3ef44f6636affef8138f4c8b7dec1333f50377 (patch) | |
| tree | 977698cc6d2d56775f140967792ad637db03490f /tests/regression/opencsgtest | |
| parent | 5271b345bc755f37e98d7f497f6686d34990fa5c (diff) | |
| parent | c7cea0082e427f3c53985845f05e8737873c8a25 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into planar
Conflicts:
src/CGAL_Nef_polyhedron.cc
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/opencsgtest')
| -rw-r--r-- | tests/regression/opencsgtest/polyhedron-tests-expected.png | bin | 10415 -> 9915 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/rotate_extrude-tests-expected.png | bin | 18320 -> 19174 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/regression/opencsgtest/polyhedron-tests-expected.png b/tests/regression/opencsgtest/polyhedron-tests-expected.png Binary files differindex 0740f1a..f6665cf 100644 --- a/tests/regression/opencsgtest/polyhedron-tests-expected.png +++ b/tests/regression/opencsgtest/polyhedron-tests-expected.png diff --git a/tests/regression/opencsgtest/rotate_extrude-tests-expected.png b/tests/regression/opencsgtest/rotate_extrude-tests-expected.png Binary files differindex 861f6ab..0be247e 100644 --- a/tests/regression/opencsgtest/rotate_extrude-tests-expected.png +++ b/tests/regression/opencsgtest/rotate_extrude-tests-expected.png |
