Age | Commit message (Collapse) | Author |
|
Conflicts:
src/parsersettings.cc
|
|
the command-line. Fixes #128
|
|
|
|
|
|
|
|
|
|
Reported by nop head.
|
|
commented out line open, shadowing command-line parameters. Fixes #76
|
|
|
|
dependency. When reinstating this, use another mechanism
|
|
|
|
|
|
to boost filesystem. Fixes #63
|
|
|
|
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PolySetCGALEvaluator
|
|
classes in header files, reducing coupling and thus compilation times
|
|
|
|
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
|
|
|
|
|