79a7f588b9
# Conflicts: # src/libslic3r/CMakeLists.txt # src/libslic3r/Format/3mf.cpp # src/libslic3r/Model.hpp # src/libslic3r/Technologies.hpp # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.hpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp # src/slic3r/GUI/Selection.cpp # src/slic3r/GUI/Selection.hpp |
||
---|---|---|
.. | ||
catch2 | ||
cpp17 | ||
data | ||
example | ||
fff_print | ||
libnest2d | ||
libslic3r | ||
sla_print | ||
slic3rutils | ||
catch_main.hpp | ||
CMakeLists.txt | ||
test_utils.hpp |