Merge branch 'master' into boost_filesystem

Conflicts:
	tests/CMakeLists.txt

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/regression/dumptest/minkowski3-tests-expected.txt b/tests/regression/dumptest/minkowski3-tests-expected.txt
index 0226beb..5244014 100644
--- a/tests/regression/dumptest/minkowski3-tests-expected.txt
+++ b/tests/regression/dumptest/minkowski3-tests-expected.txt
@@ -5,7 +5,7 @@
 					cube(size = [10, 10, 5], center = true);
 					cube(size = [8, 8, 10], center = true);
 				}
-				cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 2, r2 = 2, center = false);
+				cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 2, r2 = 2, center = false);
 			}
 		}
 	}
@@ -16,7 +16,7 @@
 					cube(size = [10, 10, 5], center = false);
 					cube(size = [5, 5, 5], center = false);
 				}
-				cylinder($fn = 0, $fa = 12, $fs = 1, h = 5, r1 = 5, r2 = 5, center = false);
+				cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 5, r2 = 5, center = false);
 			}
 		}
 	}
@@ -24,7 +24,7 @@
 		group() {
 			minkowski(convexity = 0) {
 				cube(size = [10, 10, 5], center = false);
-				cylinder($fn = 0, $fa = 12, $fs = 1, h = 5, r1 = 5, r2 = 5, center = false);
+				cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 5, r2 = 5, center = false);
 			}
 		}
 	}