Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion

2019-11-18 14:51:06 +01:00
parent db51809191 54357f846f
commit 9e7e1fb5e2
60 changed files with 3908 additions and 577 deletions
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -158,6 +158,7 @@ set(SLIC3R_GUI_SOURCES
    Utils/UndoRedo.hpp
    Utils/HexFile.cpp
    Utils/HexFile.hpp
+    Utils/Thread.hpp
 )

 if (APPLE)