Filip Sykala 5464b650d1 Merge branch 'tm_ui_job_rework_2' into fs_emboss ... # Conflicts: # src/slic3r/CMakeLists.txt # src/slic3r/GUI/Jobs/PlaterJob.cpp		2021-12-14 19:04:52 +01:00
..
catch2
cpp17
data	fix test	2021-10-21 08:36:38 +02:00
example
fff_print	Eradicated admesh from TriangleMesh:	2021-09-20 17:12:22 +02:00
libnest2d
libslic3r	Merge branch 'master' into fs_emboss	2021-12-13 10:52:04 +01:00
sla_print	Eradicated admesh from TriangleMesh:	2021-09-20 17:12:22 +02:00
slic3rutils	Add possibility to wait for current job to stop.	2021-12-03 01:59:34 +01:00
catch_main.hpp
CMakeLists.txt
test_utils.hpp