Florens Wasserfall 8485e4bea2 Merge branch 'master' into adaptive-slicing
Conflicts:
	lib/Slic3r/GUI/Tab.pm
	lib/Slic3r/Print/Object.pm
	lib/Slic3r/Test.pm
	xs/src/libslic3r/PrintConfig.cpp
	xs/src/libslic3r/PrintConfig.hpp
	xs/src/libslic3r/PrintObject.cpp
2016-06-06 12:07:34 +02:00
..