Merge with master

2018-07-17 08:54:17 +02:00
parent a80ef7201b 210eeff160
commit 8175c9d306
73 changed files with 16444 additions and 133 deletions
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -56,6 +56,7 @@

 #include "../Utils/PresetUpdater.hpp"
 #include "../Config/Snapshot.hpp"
+
 #include "3DScene.hpp"
 #include "libslic3r/I18N.hpp"