Alessandro Ranellucci ba8148f4ad Merge branch 'printcpp' of github.com:sapir/Slic3r into sapir-printcpp ...

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

2014-06-10 14:46:40 +02:00

1.6 KiB

Raw Blame History

View Raw