diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
| commit | 610ab20ddba6d07e9b6e0b7565a44913854e467b (patch) | |
| tree | 81c75e9ce9b68490bc5a81293290b96bb49d9510 /testdata | |
| parent | 2376814f2c4dd6e34a765ca37275b136785b26fd (diff) | |
| parent | 04c340b35d8809b595ebb3ce53b7a00313d00a9b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
doc/testing.txt
tests/CMakeLists.txt
tests/system-gl.cc
tests/system-gl.h
Diffstat (limited to 'testdata')
| -rw-r--r-- | testdata/scad/features/difference-tests.scad | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testdata/scad/features/difference-tests.scad b/testdata/scad/features/difference-tests.scad index 4d82676..3bcd9e5 100644 --- a/testdata/scad/features/difference-tests.scad +++ b/testdata/scad/features/difference-tests.scad @@ -10,7 +10,7 @@ difference() { translate([12,0,0]) difference() { cube([10,10,10], center=true); - cylinder(r=4, h=10, center=true); + cylinder(r=4, h=10.5, center=true); } translate([0,12,0]) difference() { @@ -21,7 +21,7 @@ translate([0,12,0]) difference() { translate([12,12,0]) difference() { 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]) difference() { |