Fixed conflicts after merge with master

2021-05-07 13:14:11 +02:00
parent a91306032c 4d2c2070f8
commit ec9c3891cf
79 changed files with 3357 additions and 2245 deletions
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -191,6 +191,8 @@ set(SLIC3R_GUI_SOURCES
    GUI/ExtraRenderers.hpp
    GUI/ProjectDirtyStateManager.hpp
    GUI/ProjectDirtyStateManager.cpp
+    GUI/DesktopIntegrationDialog.cpp
+    GUI/DesktopIntegrationDialog.hpp
    Utils/Http.cpp
    Utils/Http.hpp
    Utils/FixModelByWin10.cpp