diff options
author | bubnikv <bubnikv@gmail.com> | 2018-09-01 12:49:38 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2018-09-01 12:49:38 +0300 |
commit | 6a1f15823f3581478d926fa9f2c61672935a6dd9 (patch) | |
tree | 93bedff80aa752832e4a2c56330a4acc3e002377 /xs | |
parent | 3c0060d9ac646b334ecbc64dee9f2cf733fceade (diff) | |
parent | 22569de00fb05d3e69695d1a07819b795bbde134 (diff) |
Merge remote-tracking branch 'origin/master' into support_improvements
Diffstat (limited to 'xs')
-rw-r--r-- | xs/src/libslic3r/libslic3r.h | 2 | ||||
-rw-r--r-- | xs/src/slic3r/Utils/Duet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xs/src/libslic3r/libslic3r.h b/xs/src/libslic3r/libslic3r.h index 6db60440b..ddd056bc7 100644 --- a/xs/src/libslic3r/libslic3r.h +++ b/xs/src/libslic3r/libslic3r.h @@ -14,7 +14,7 @@ #include <boost/thread.hpp> #define SLIC3R_FORK_NAME "Slic3r Prusa Edition" -#define SLIC3R_VERSION "1.41.0-beta2" +#define SLIC3R_VERSION "1.41.0" #define SLIC3R_BUILD "UNKNOWN" typedef int32_t coord_t; diff --git a/xs/src/slic3r/Utils/Duet.cpp b/xs/src/slic3r/Utils/Duet.cpp index 865d2b418..82a42eb71 100644 --- a/xs/src/slic3r/Utils/Duet.cpp +++ b/xs/src/slic3r/Utils/Duet.cpp @@ -230,7 +230,7 @@ std::string Duet::timestamp_str() const auto tm = *std::localtime(&t); char buffer[BUFFER_SIZE]; - std::strftime(buffer, BUFFER_SIZE, "time=%Y-%d-%mT%H:%M:%S", &tm); + std::strftime(buffer, BUFFER_SIZE, "time=%Y-%m-%dT%H:%M:%S", &tm); return std::string(buffer); } |