2 Commits

Author SHA1 Message Date
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
Alessandro Ranellucci
5d77c160c6 Changes to the GUI. New preset editor dialog. Option overrides in plater and between configs. More. 2017-03-17 01:22:54 +01:00