Alessandro Ranellucci fa07c512b4 Merge branch 'master' into xsdata ...

Conflicts:
	lib/Slic3r/Layer/Region.pm
	lib/Slic3r/Print.pm
	lib/Slic3r/Print/Object.pm

2013-08-16 09:09:56 +02:00

..

Object.pm

Merge branch 'master' into xsdata

2013-08-16 09:09:56 +02:00

Region.pm

Rename materials to regions

2012-09-23 02:52:31 +02:00