Alessandro Ranellucci 0bdea60b53 Merge branch 'region-config' ...

Conflicts:
	lib/Slic3r/Format/AMF/Parser.pm

2014-01-05 14:59:36 +01:00

..

Slic3r

Merge branch 'region-config'

2014-01-05 14:59:36 +01:00

Slic3r.pm

More work for refactoring Flow/Extruder

2014-01-03 20:02:00 +01:00