Alessandro Ranellucci 1fadfd6fb8 Merge remote-tracking branch 'origin/master' into gui3
Conflicts:
	lib/Slic3r/GUI.pm
	lib/Slic3r/GUI/Plater.pm
	lib/Slic3r/GUI/PresetEditor.pm
	slic3r.pl
	xs/src/libslic3r/Config.cpp
	xs/src/libslic3r/Config.hpp
2017-03-20 17:00:42 +01:00
..
2016-12-17 19:51:29 +01:00
2017-03-17 15:45:24 +01:00