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/csgtermtest/assign-expected.term b/tests/regression/csgtermtest/assign-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/assign-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/child-expected.term b/tests/regression/csgtermtest/child-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/child-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/circle-expected.term b/tests/regression/csgtermtest/circle-expected.term
deleted file mode 100644
index b8c8161..0000000
--- a/tests/regression/csgtermtest/circle-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-circle2
diff --git a/tests/regression/csgtermtest/color-expected.term b/tests/regression/csgtermtest/color-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/color-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/cube-expected.term b/tests/regression/csgtermtest/cube-expected.term
deleted file mode 100644
index 3393bc4..0000000
--- a/tests/regression/csgtermtest/cube-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-cube2
diff --git a/tests/regression/csgtermtest/cylinder-expected.term b/tests/regression/csgtermtest/cylinder-expected.term
deleted file mode 100644
index f3dd1f9..0000000
--- a/tests/regression/csgtermtest/cylinder-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-cylinder2
diff --git a/tests/regression/csgtermtest/difference-expected.term b/tests/regression/csgtermtest/difference-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/difference-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/dxf_linear_extrude-expected.term b/tests/regression/csgtermtest/dxf_linear_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/dxf_linear_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.term b/tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/echo-expected.term b/tests/regression/csgtermtest/echo-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/echo-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/for-expected.term b/tests/regression/csgtermtest/for-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/for-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/glide-expected.term b/tests/regression/csgtermtest/glide-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/glide-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/group-expected.term b/tests/regression/csgtermtest/group-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/group-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/hull-expected.term b/tests/regression/csgtermtest/hull-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/hull-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/if-expected.term b/tests/regression/csgtermtest/if-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/if-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/import-expected.term b/tests/regression/csgtermtest/import-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/import-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/import_dxf-expected.term b/tests/regression/csgtermtest/import_dxf-expected.term
deleted file mode 100644
index 847d6c3..0000000
--- a/tests/regression/csgtermtest/import_dxf-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-import2
diff --git a/tests/regression/csgtermtest/import_off-expected.term b/tests/regression/csgtermtest/import_off-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/import_off-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/import_stl-expected.term b/tests/regression/csgtermtest/import_stl-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/import_stl-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/intersection-expected.term b/tests/regression/csgtermtest/intersection-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/intersection-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/intersection_for-expected.term b/tests/regression/csgtermtest/intersection_for-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/intersection_for-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/linear_extrude-expected.term b/tests/regression/csgtermtest/linear_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/linear_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/minkowski-expected.term b/tests/regression/csgtermtest/minkowski-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/minkowski-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/mirror-expected.term b/tests/regression/csgtermtest/mirror-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/mirror-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/multmatrix-expected.term b/tests/regression/csgtermtest/multmatrix-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/multmatrix-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/polygon-expected.term b/tests/regression/csgtermtest/polygon-expected.term
deleted file mode 100644
index b41dfc6..0000000
--- a/tests/regression/csgtermtest/polygon-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-polygon2
diff --git a/tests/regression/csgtermtest/polyhedron-expected.term b/tests/regression/csgtermtest/polyhedron-expected.term
deleted file mode 100644
index 5ccc055..0000000
--- a/tests/regression/csgtermtest/polyhedron-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-polyhedron2
diff --git a/tests/regression/csgtermtest/projection-expected.term b/tests/regression/csgtermtest/projection-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/projection-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/render-expected.term b/tests/regression/csgtermtest/render-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/render-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/rotate-expected.term b/tests/regression/csgtermtest/rotate-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/rotate-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/rotate_extrude-expected.term b/tests/regression/csgtermtest/rotate_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/rotate_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/scale-expected.term b/tests/regression/csgtermtest/scale-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/scale-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/sphere-expected.term b/tests/regression/csgtermtest/sphere-expected.term
deleted file mode 100644
index f9b8d73..0000000
--- a/tests/regression/csgtermtest/sphere-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-sphere2
diff --git a/tests/regression/csgtermtest/square-expected.term b/tests/regression/csgtermtest/square-expected.term
deleted file mode 100644
index 8190c0f..0000000
--- a/tests/regression/csgtermtest/square-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-square2
diff --git a/tests/regression/csgtermtest/subdiv-expected.term b/tests/regression/csgtermtest/subdiv-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/subdiv-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/surface-expected.term b/tests/regression/csgtermtest/surface-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/surface-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/translate-expected.term b/tests/regression/csgtermtest/translate-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/translate-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/union-expected.term b/tests/regression/csgtermtest/union-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/union-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object