3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'acp-voronoi'

Browse source 
Conflicts:
	xs/xsp/my.map
This commit is contained in:
Alessandro Ranellucci 2014-07-26 22:38:35 +02:00
commit 3ff613d166
18 changed files with 509 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/MANIFEST
View file

@ -1677,6 +1677,8 @@ src/Line.cpp
src/Line.hpp
src/Model.cpp
src/Model.hpp
src/MotionPlanner.cpp
src/MotionPlanner.hpp
src/MultiPoint.cpp
src/MultiPoint.hpp
src/myinit.h
@ -1735,6 +1737,7 @@ t/14_geometry.t
t/15_config.t
t/16_flow.t
t/17_boundingbox.t
t/18_motionplanner.t
t/19_model.t
t/20_print.t
xsp/BoundingBox.xsp
@ -1751,6 +1754,7 @@ xsp/Geometry.xsp
xsp/Layer.xsp
xsp/Line.xsp
xsp/Model.xsp
xsp/MotionPlanner.xsp
xsp/my.map
xsp/mytype.map
xsp/PlaceholderParser.xsp