Alessandro Ranellucci 1064c9bb2a Merge branch 'master' into grow-narrow ... Conflicts: lib/Slic3r/Fill.pm lib/Slic3r/Print/Object.pm		2013-03-17 02:30:20 +01:00
..
Object.pm	Merge branch 'master' into grow-narrow	2013-03-17 02:30:20 +01:00
Region.pm	Rename materials to regions	2012-09-23 02:52:31 +02:00