Merge with master

This commit is contained in:
Enrico Turri 2018-07-17 08:54:17 +02:00
commit 8175c9d306
73 changed files with 16444 additions and 133 deletions

View file

@ -56,6 +56,7 @@
#include "../Utils/PresetUpdater.hpp"
#include "../Config/Snapshot.hpp"
#include "3DScene.hpp"
#include "libslic3r/I18N.hpp"