| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	tests/opencsgtest.cc
 | 
 | 
by nophead
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Win32 assertion error fix
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
under Windows, reported by Stony Smith
 | 
 | 
 | 
 | 
create 'expected' images for throwntogethertest
create imgdiff_fail html file generation
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
I don't have a platform to test this on but the change looks simple enough and from a previously trusted author.
 | 
 | 
 | 
 | 
 | 
 | 
Merge remote branch 'upstream/visitor' into visitortests
Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc
 | 
 | 
 | 
 | 
 | 
 | 
Merge remote branch 'upstream/master' into visitortests
Conflicts:
	src/cgaladv.cc
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |