Age | Commit message (Collapse) | Author |
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
OpenCSG mode
|
|
git-svn-id: http://svn.clifford.at/openscad/trunk@573 b57f626f-c46c-0410-a088-ec61d464b74c
|
|
git-svn-id: http://svn.clifford.at/openscad/trunk@571 b57f626f-c46c-0410-a088-ec61d464b74c
|
|
|
|
|