Merge branch 'master' into sender

This commit is contained in:
Alessandro Ranellucci committed 2014-12-27 18:10:03 +01:00
commit 8b438dc0de
3 files changed
+105 -92

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@
#include <iostream>
#include <sstream>
#define SLIC3R_VERSION "1.2.2-dev"
#define SLIC3R_VERSION "1.2.2"
#define EPSILON 1e-4
#define SCALING_FACTOR 0.000001