1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-31 11:15:52 +00:00

Fixed conflicts after merge with master

This commit is contained in:
enricoturri1966
2021-05-07 13:14:11 +02:00
79 changed files with 3357 additions and 2245 deletions
+2
View File
@@ -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