Merge branch 'master' into dynamic-flow
Conflicts: lib/Slic3r/ExPolygon.pm
This commit is contained in:
commit
1cedb00f20
34 changed files with 529 additions and 260 deletions
1
MANIFEST
1
MANIFEST
|
@ -35,6 +35,7 @@ lib/Slic3r/GUI/SkeinPanel.pm
|
|||
lib/Slic3r/GUI/Tab.pm
|
||||
lib/Slic3r/Layer.pm
|
||||
lib/Slic3r/Line.pm
|
||||
lib/Slic3r/Model.pm
|
||||
lib/Slic3r/Point.pm
|
||||
lib/Slic3r/Polygon.pm
|
||||
lib/Slic3r/Polyline.pm
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue