Merge branch 'master' into no-testprograms

Conflicts:
	tests/CMakeLists.txt
	tests/regression/csgtermtest/assign-expected.term
	tests/regression/csgtermtest/child-expected.term
	tests/regression/csgtermtest/circle-expected.term
	tests/regression/csgtermtest/color-expected.term
	tests/regression/csgtermtest/cube-expected.term
	tests/regression/csgtermtest/cylinder-expected.term
	tests/regression/csgtermtest/difference-expected.term
	tests/regression/csgtermtest/dxf_linear_extrude-expected.term
	tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
	tests/regression/csgtermtest/echo-expected.term
	tests/regression/csgtermtest/for-expected.term
	tests/regression/csgtermtest/glide-expected.term
	tests/regression/csgtermtest/group-expected.term
	tests/regression/csgtermtest/hull-expected.term
	tests/regression/csgtermtest/if-expected.term
	tests/regression/csgtermtest/import-expected.term
	tests/regression/csgtermtest/import_dxf-expected.term
	tests/regression/csgtermtest/import_off-expected.term
	tests/regression/csgtermtest/import_stl-expected.term
	tests/regression/csgtermtest/intersection-expected.term
	tests/regression/csgtermtest/intersection_for-expected.term
	tests/regression/csgtermtest/linear_extrude-expected.term
	tests/regression/csgtermtest/minkowski-expected.term
	tests/regression/csgtermtest/mirror-expected.term
	tests/regression/csgtermtest/multmatrix-expected.term
	tests/regression/csgtermtest/polygon-expected.term
	tests/regression/csgtermtest/polyhedron-expected.term
	tests/regression/csgtermtest/projection-expected.term
	tests/regression/csgtermtest/render-expected.term
	tests/regression/csgtermtest/rotate-expected.term
	tests/regression/csgtermtest/rotate_extrude-expected.term
	tests/regression/csgtermtest/scale-expected.term
	tests/regression/csgtermtest/sphere-expected.term
	tests/regression/csgtermtest/square-expected.term
	tests/regression/csgtermtest/subdiv-expected.term
	tests/regression/csgtermtest/surface-expected.term
	tests/regression/csgtermtest/translate-expected.term
	tests/regression/csgtermtest/union-expected.term
	tests/regression/dumptest/circle-expected.csg
	tests/regression/dumptest/color-expected.csg
	tests/regression/dumptest/cube-expected.csg
	tests/regression/dumptest/cylinder-expected.csg
	tests/regression/dumptest/difference-expected.csg
	tests/regression/dumptest/dxf_linear_extrude-expected.csg
	tests/regression/dumptest/dxf_rotate_extrude-expected.csg
	tests/regression/dumptest/glide-expected.csg
	tests/regression/dumptest/import-expected.csg
	tests/regression/dumptest/import_dxf-expected.csg
	tests/regression/dumptest/import_off-expected.csg
	tests/regression/dumptest/import_stl-expected.csg
	tests/regression/dumptest/intersection-expected.csg
	tests/regression/dumptest/intersection_for-expected.csg
	tests/regression/dumptest/linear_extrude-expected.csg
	tests/regression/dumptest/minkowski-expected.csg
	tests/regression/dumptest/mirror-expected.csg
	tests/regression/dumptest/multmatrix-expected.csg
	tests/regression/dumptest/polygon-expected.csg
	tests/regression/dumptest/polyhedron-expected.csg
	tests/regression/dumptest/projection-expected.csg
	tests/regression/dumptest/render-expected.csg
	tests/regression/dumptest/rotate-expected.csg
	tests/regression/dumptest/rotate_extrude-expected.csg
	tests/regression/dumptest/scale-expected.csg
	tests/regression/dumptest/sphere-expected.csg
	tests/regression/dumptest/square-expected.csg
	tests/regression/dumptest/subdiv-expected.csg
	tests/regression/dumptest/surface-expected.csg
	tests/regression/dumptest/translate-expected.csg

38 files changed, 0 insertions, 38 deletions

diff --git a/tests/regression/csgtexttest/assign-expected.txt b/tests/regression/csgtexttest/assign-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/assign-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/child-expected.txt b/tests/regression/csgtexttest/child-expected.txt
deleted file mode 100644
index 331822f..0000000
--- a/tests/regression/csgtexttest/child-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1
diff --git a/tests/regression/csgtexttest/circle-expected.txt b/tests/regression/csgtexttest/circle-expected.txt
deleted file mode 100644
index 44ca16a..0000000
--- a/tests/regression/csgtexttest/circle-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(circle)
diff --git a/tests/regression/csgtexttest/color-expected.txt b/tests/regression/csgtexttest/color-expected.txt
deleted file mode 100644
index 6140174..0000000
--- a/tests/regression/csgtexttest/color-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(color2)
diff --git a/tests/regression/csgtexttest/cube-expected.txt b/tests/regression/csgtexttest/cube-expected.txt
deleted file mode 100644
index 07b688d..0000000
--- a/tests/regression/csgtexttest/cube-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(cube)
diff --git a/tests/regression/csgtexttest/cylinder-expected.txt b/tests/regression/csgtexttest/cylinder-expected.txt
deleted file mode 100644
index 3f8a41f..0000000
--- a/tests/regression/csgtexttest/cylinder-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(cylinder)
diff --git a/tests/regression/csgtexttest/difference-expected.txt b/tests/regression/csgtexttest/difference-expected.txt
deleted file mode 100644
index 551bb16..0000000
--- a/tests/regression/csgtexttest/difference-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(difference2)
diff --git a/tests/regression/csgtexttest/dxf_linear_extrude-expected.txt b/tests/regression/csgtexttest/dxf_linear_extrude-expected.txt
deleted file mode 100644
index fa1671c..0000000
--- a/tests/regression/csgtexttest/dxf_linear_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(linear_extrude)
diff --git a/tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt b/tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt
deleted file mode 100644
index 452f8e4..0000000
--- a/tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(rotate_extrude)
diff --git a/tests/regression/csgtexttest/echo-expected.txt b/tests/regression/csgtexttest/echo-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/echo-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/for-expected.txt b/tests/regression/csgtexttest/for-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/for-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/glide-expected.txt b/tests/regression/csgtexttest/glide-expected.txt
deleted file mode 100644
index a792750..0000000
--- a/tests/regression/csgtexttest/glide-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(glide2)
diff --git a/tests/regression/csgtexttest/group-expected.txt b/tests/regression/csgtexttest/group-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/group-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/hull-expected.txt b/tests/regression/csgtexttest/hull-expected.txt
deleted file mode 100644
index dc47755..0000000
--- a/tests/regression/csgtexttest/hull-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(hull2)
diff --git a/tests/regression/csgtexttest/if-expected.txt b/tests/regression/csgtexttest/if-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/if-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/import-expected.txt b/tests/regression/csgtexttest/import-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/import_dxf-expected.txt b/tests/regression/csgtexttest/import_dxf-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import_dxf-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/import_off-expected.txt b/tests/regression/csgtexttest/import_off-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import_off-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/import_stl-expected.txt b/tests/regression/csgtexttest/import_stl-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import_stl-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/intersection-expected.txt b/tests/regression/csgtexttest/intersection-expected.txt
deleted file mode 100644
index 0ce0967..0000000
--- a/tests/regression/csgtexttest/intersection-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(intersection2)
diff --git a/tests/regression/csgtexttest/intersection_for-expected.txt b/tests/regression/csgtexttest/intersection_for-expected.txt
deleted file mode 100644
index 0ce0967..0000000
--- a/tests/regression/csgtexttest/intersection_for-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(intersection2)
diff --git a/tests/regression/csgtexttest/linear_extrude-expected.txt b/tests/regression/csgtexttest/linear_extrude-expected.txt
deleted file mode 100644
index fa1671c..0000000
--- a/tests/regression/csgtexttest/linear_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(linear_extrude)
diff --git a/tests/regression/csgtexttest/minkowski-expected.txt b/tests/regression/csgtexttest/minkowski-expected.txt
deleted file mode 100644
index e601bac..0000000
--- a/tests/regression/csgtexttest/minkowski-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(minkowski2)
diff --git a/tests/regression/csgtexttest/mirror-expected.txt b/tests/regression/csgtexttest/mirror-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/mirror-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/multmatrix-expected.txt b/tests/regression/csgtexttest/multmatrix-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/multmatrix-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/polygon-expected.txt b/tests/regression/csgtexttest/polygon-expected.txt
deleted file mode 100644
index e308e30..0000000
--- a/tests/regression/csgtexttest/polygon-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(polygon)
diff --git a/tests/regression/csgtexttest/polyhedron-expected.txt b/tests/regression/csgtexttest/polyhedron-expected.txt
deleted file mode 100644
index 994b16d..0000000
--- a/tests/regression/csgtexttest/polyhedron-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(polyhedron)
diff --git a/tests/regression/csgtexttest/projection-expected.txt b/tests/regression/csgtexttest/projection-expected.txt
deleted file mode 100644
index 38b6abf..0000000
--- a/tests/regression/csgtexttest/projection-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(projection)
diff --git a/tests/regression/csgtexttest/render-expected.txt b/tests/regression/csgtexttest/render-expected.txt
deleted file mode 100644
index b53708e..0000000
--- a/tests/regression/csgtexttest/render-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(render2)
diff --git a/tests/regression/csgtexttest/rotate-expected.txt b/tests/regression/csgtexttest/rotate-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/rotate-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/rotate_extrude-expected.txt b/tests/regression/csgtexttest/rotate_extrude-expected.txt
deleted file mode 100644
index 452f8e4..0000000
--- a/tests/regression/csgtexttest/rotate_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(rotate_extrude)
diff --git a/tests/regression/csgtexttest/scale-expected.txt b/tests/regression/csgtexttest/scale-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/scale-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/sphere-expected.txt b/tests/regression/csgtexttest/sphere-expected.txt
deleted file mode 100644
index 2bf6a72..0000000
--- a/tests/regression/csgtexttest/sphere-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(sphere)
diff --git a/tests/regression/csgtexttest/square-expected.txt b/tests/regression/csgtexttest/square-expected.txt
deleted file mode 100644
index e235806..0000000
--- a/tests/regression/csgtexttest/square-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(square)
diff --git a/tests/regression/csgtexttest/subdiv-expected.txt b/tests/regression/csgtexttest/subdiv-expected.txt
deleted file mode 100644
index b096229..0000000
--- a/tests/regression/csgtexttest/subdiv-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(subdiv2)
diff --git a/tests/regression/csgtexttest/surface-expected.txt b/tests/regression/csgtexttest/surface-expected.txt
deleted file mode 100644
index 7c822d3..0000000
--- a/tests/regression/csgtexttest/surface-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(surface)
diff --git a/tests/regression/csgtexttest/translate-expected.txt b/tests/regression/csgtexttest/translate-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/translate-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/union-expected.txt b/tests/regression/csgtexttest/union-expected.txt
deleted file mode 100644
index 1884c0f..0000000
--- a/tests/regression/csgtexttest/union-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(union2)