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

2020-04-01 20:23:34 +02:00
parent 67c55c7490 815989d488
commit 5f31d9ed41
31 changed files with 680 additions and 543 deletions
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SLIC3R_GUI_SOURCES
    GUI/ConfigSnapshotDialog.hpp
    GUI/3DScene.cpp
    GUI/3DScene.hpp
+    GUI/format.hpp
    GUI/GLShader.cpp
    GUI/GLShader.hpp    
    GUI/GLCanvas3D.hpp