Merge branch 'master' into boost_filesystem

Conflicts:
	tests/CMakeLists.txt

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/regression/dumptest/minkowski2-tests-expected.txt b/tests/regression/dumptest/minkowski2-tests-expected.txt
index fe78b90..dc3ad86 100644
--- a/tests/regression/dumptest/minkowski2-tests-expected.txt
+++ b/tests/regression/dumptest/minkowski2-tests-expected.txt
@@ -5,7 +5,7 @@
 					square(size = [10, 10], center = true);
 					square(size = [8, 8], center = true);
 				}
-				circle($fn = 0, $fa = 12, $fs = 1, r = 2);
+				circle($fn = 0, $fa = 12, $fs = 2, r = 2);
 			}
 		}
 	}
@@ -16,7 +16,7 @@
 					square(size = [10, 10], center = false);
 					square(size = [5, 5], center = false);
 				}
-				circle($fn = 0, $fa = 12, $fs = 1, r = 5);
+				circle($fn = 0, $fa = 12, $fs = 2, r = 5);
 			}
 		}
 	}
@@ -24,7 +24,7 @@
 		group() {
 			minkowski(convexity = 0) {
 				square(size = [10, 10], center = false);
-				circle($fn = 0, $fa = 12, $fs = 1, r = 5);
+				circle($fn = 0, $fa = 12, $fs = 2, r = 5);
 			}
 		}
 	}