Alessandro Ranellucci 48e00a4c40 Merge branch 'master' into avoid-crossing-perimeters ... Conflicts: lib/Slic3r/GCode.pm lib/Slic3r/GUI/Plater.pm lib/Slic3r/Print.pm lib/Slic3r/SVG.pm		2013-01-12 19:00:18 +01:00
..
Slic3r	Merge branch 'master' into avoid-crossing-perimeters	2013-01-12 19:00:18 +01:00
Slic3r.pm	Merge branch 'master' into avoid-crossing-perimeters	2013-01-12 19:00:18 +01:00