Merge branch 'master' into amf_activate_existing_presets

This commit is contained in:
bubnikv 2018-06-27 10:33:14 +02:00
commit 68e82a7348
30 changed files with 931 additions and 543 deletions

File diff suppressed because it is too large Load diff

View file

@ -6,6 +6,7 @@ xs/src/slic3r/GUI/ButtonsDescription.cpp
xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp
xs/src/slic3r/GUI/ConfigWizard.cpp
xs/src/slic3r/GUI/FirmwareDialog.cpp
xs/src/slic3r/GUI/GLCanvas3D.cpp
xs/src/slic3r/GUI/GUI.cpp
xs/src/slic3r/GUI/MsgDialog.cpp
xs/src/slic3r/GUI/Tab.cpp