Filip Sykala e0d5505413 Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/Technologies.hpp # src/slic3r/CMakeLists.txt # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp		2022-05-31 11:14:53 +02:00
..
CMakeLists.txt	SLAArchive framework refactor	2022-02-17 12:50:40 +01:00
slic3r_jobs_tests.cpp	Merge branch 'master' into fs_emboss	2022-05-31 11:14:53 +02:00
slic3rutils_tests_main.cpp	Enable http digest authentication for CURL	2020-11-25 13:58:03 +01:00