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
..
Slic3r	Merge branch 'master' into xsdata	2013-08-25 19:59:42 +02:00
Slic3r.pm	Merge branch 'master' into xsdata	2013-08-16 09:09:56 +02:00