diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
| commit | fdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch) | |
| tree | 6a779b50ef65474af9c539ad7d42268f7e760ae8 /tests/regression/dumptest/intersection-tests-expected.txt | |
| parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/dumptest/intersection-tests-expected.txt')
| -rw-r--r-- | tests/regression/dumptest/intersection-tests-expected.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regression/dumptest/intersection-tests-expected.txt b/tests/regression/dumptest/intersection-tests-expected.txt index e6bbf32..a9dba29 100644 --- a/tests/regression/dumptest/intersection-tests-expected.txt +++ b/tests/regression/dumptest/intersection-tests-expected.txt @@ -24,7 +24,7 @@ multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) { intersection() { cube(size = [10, 10, 10], center = true); - multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7.01], [0, 0, 0, 1]]) { cylinder($fn = 0, $fa = 12, $fs = 2, h = 4, r1 = 4, r2 = 4, center = true); } } |