Filip Sykala a50d93cd66 Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/Geometry.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.cpp # src/slic3r/GUI/Gizmos/GLGizmoMove.cpp # src/slic3r/GUI/Gizmos/GLGizmoMove.hpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp # src/slic3r/GUI/Gizmos/GLGizmoScale.cpp # src/slic3r/GUI/Gizmos/GLGizmoScale.hpp # src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp # src/slic3r/GUI/ImGuiWrapper.cpp # src/slic3r/GUI/ImGuiWrapper.hpp # src/slic3r/GUI/Selection.cpp # tests/slic3rutils/slic3r_jobs_tests.cpp		2022-02-02 15:27:25 +01:00
..
CMakeLists.txt	Basic tests for BoostThreadWorker	2022-01-11 11:26:26 +01:00
slic3r_jobs_tests.cpp	Merge branch 'master' into fs_emboss	2022-02-02 15:27:25 +01:00
slic3rutils_tests_main.cpp	Enable http digest authentication for CURL	2020-11-25 13:58:03 +01:00