Age | Commit message (Collapse) | Author |
|
|
|
Merge remote branch 'upstream/master' into visitortests
Conflicts:
src/cgaladv.cc
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fix build errors on windows
|
|
|
|
|
|
Conflicts:
src/mainwin.cc
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/primitives.cc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
of this initiative
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/OpenCSGRenderer.cc
src/csgops.cc
src/mainwin.cc
src/polyset.cc
src/projection.cc
|
|
|