Filip Sykala - NTB T15p 79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss ... # 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		2022-07-20 13:02:07 +02:00
..
CMakeLists.txt	detection of intersection source	2022-06-29 15:34:33 +02:00
slic3r_jobs_tests.cpp
slic3rutils_tests_main.cpp