Joseph Lenox e6c715cad2 Merge branch 'adaptive-slicing' into merge-adaptive
# Conflicts:
#	xs/src/libslic3r/Model.cpp
#	xs/src/libslic3r/Model.hpp
2017-09-24 13:39:28 -05:00
..
2015-12-08 11:07:45 +01:00
2013-06-22 17:16:45 +02:00
2016-03-26 12:21:54 +01:00
2016-12-01 16:57:47 +01:00
2017-04-08 10:57:16 +02:00
2017-03-28 08:44:11 +02:00
2016-11-13 16:46:17 -06:00