Alessandro Ranellucci b92642459f Merge branch 'master' into dynamic-flow ... Conflicts: lib/Slic3r/Flow.pm lib/Slic3r/Layer.pm		2012-10-04 15:23:19 +02:00
..
Slic3r	Merge branch 'master' into dynamic-flow	2012-10-04 15:23:19 +02:00
Slic3r.pm	Bump version number	2012-09-28 17:44:38 +02:00