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 /testdata/scad/features/intersection-tests.scad | |
parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'testdata/scad/features/intersection-tests.scad')
-rw-r--r-- | testdata/scad/features/intersection-tests.scad | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testdata/scad/features/intersection-tests.scad b/testdata/scad/features/intersection-tests.scad index e53f3c9..4a1d7e3 100644 --- a/testdata/scad/features/intersection-tests.scad +++ b/testdata/scad/features/intersection-tests.scad @@ -22,7 +22,7 @@ translate([12,0,0]) intersection() { translate([12,12,0]) intersection() { cube([10,10,10], center=true); - translate([0,0,7]) cylinder(r=4, h=4, center=true); + translate([0,0,7.01]) cylinder(r=4, h=4, center=true); } translate([24,0,0]) intersection() { |