Merge branch 'master' into amf_activate_existing_presets

This commit is contained in:
bubnikv 2018-07-03 13:04:11 +02:00
commit e61b25de7c
3 changed files with 48 additions and 34 deletions

View file

@ -14,7 +14,7 @@
#include <boost/thread.hpp>
#define SLIC3R_FORK_NAME "Slic3r Prusa Edition"
#define SLIC3R_VERSION "1.40.0"
#define SLIC3R_VERSION "1.40.1-rc"
#define SLIC3R_BUILD "UNKNOWN"
typedef int32_t coord_t;