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

This commit is contained in:
enricoturri1966 2020-05-04 09:37:29 +02:00
commit 813e268d7e
39 changed files with 2878 additions and 667 deletions

View file

@ -165,6 +165,8 @@ set(SLIC3R_GUI_SOURCES
GUI/ObjectDataViewModel.hpp
GUI/InstanceCheck.cpp
GUI/InstanceCheck.hpp
GUI/Search.cpp
GUI/Search.hpp
Utils/Http.cpp
Utils/Http.hpp
Utils/FixModelByWin10.cpp