Merge remote-tracking branch 'origin/master' into profile_changes_reset

This commit is contained in:
YuSanka committed 2018-03-22 14:18:48 +01:00
commit 08a8fe84a4
46 files changed
+11102 -6732

No files matched your search

File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
+2
View File
@@ -9,6 +9,8 @@ xs/src/slic3r/GUI/2DBed.cpp
xs/src/slic3r/GUI/PresetHints.cpp
xs/src/slic3r/GUI/Preferences.hpp
xs/src/slic3r/GUI/Preferences.cpp
xs/src/slic3r/GUI/BonjourDialog.cpp
xs/src/slic3r/Utils/OctoPrint.cpp
xs/src/libslic3r/PrintConfig.cpp
xs/src/libslic3r/GCode/PreviewData.cpp
lib/Slic3r/GUI.pm