diff options
author | bubnikv <bubnikv@gmail.com> | 2019-09-12 11:19:09 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2019-09-12 11:19:09 +0300 |
commit | b4f2df6a98369b0de813c237c564c4cffbedf4ea (patch) | |
tree | 1279340beec33e39adb05ae3020a25d7126ded04 /src/slic3r/Config | |
parent | 22ab0220889ca72dc82b478be3e0c62bca4cfba6 (diff) | |
parent | 6f4fff1b29476e70a327f8c0c2ca2e16dc6b6a34 (diff) |
Merge remote-tracking branch 'remotes/origin/master' into dev
Diffstat (limited to 'src/slic3r/Config')
-rw-r--r-- | src/slic3r/Config/Snapshot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/Config/Snapshot.cpp b/src/slic3r/Config/Snapshot.cpp index 2aebd0c72..622b31a17 100644 --- a/src/slic3r/Config/Snapshot.cpp +++ b/src/slic3r/Config/Snapshot.cpp @@ -1,7 +1,6 @@ #include "Snapshot.hpp" #include "../GUI/AppConfig.hpp" #include "../GUI/PresetBundle.hpp" -#include "../Utils/Time.hpp" #include <time.h> @@ -13,6 +12,7 @@ #include <boost/property_tree/ptree.hpp> #include "libslic3r/libslic3r.h" +#include "libslic3r/Time.hpp" #include "libslic3r/Config.hpp" #include "libslic3r/FileParserError.hpp" #include "libslic3r/Utils.hpp" |