Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri committed 2019-11-07 09:55:44 +01:00
commit a624590b36
117 files changed
+6769 -1131

No files matched your search

+1
View File
@@ -45,6 +45,7 @@ src/slic3r/GUI/WipeTowerDialog.cpp
src/slic3r/GUI/wxExtensions.cpp
src/slic3r/Utils/Duet.cpp
src/slic3r/Utils/OctoPrint.cpp
src/slic3r/Utils/FlashAir.cpp
src/slic3r/Utils/PresetUpdater.cpp
src/slic3r/Utils/FixModelByWin10.cpp
src/libslic3r/Zipper.cpp