Fixed conflicts after merging with master

This commit is contained in:
Enrico Turri
2018-08-27 14:00:53 +02:00
38 changed files with 835 additions and 126 deletions

View File

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