Alessandro Ranellucci fc9cec9d81 Merge branch 'master' into xsdata ... Conflicts: lib/Slic3r/Layer/Region.pm lib/Slic3r/Print/Object.pm		2013-08-25 19:59:42 +02:00
..
Object.pm	Merge branch 'master' into xsdata	2013-08-25 19:59:42 +02:00
Region.pm	Rename materials to regions	2012-09-23 02:52:31 +02:00