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-19 14:58:05 +01:00
2015-07-02 14:29:20 +02:00
2016-11-24 15:38:59 +01:00
2014-11-15 23:06:15 +01:00
2015-01-15 18:49:07 +01:00