Merge branch 'acp-voronoi'

Conflicts:
	xs/xsp/my.map
This commit is contained in:
Alessandro Ranellucci
2014-07-26 22:38:35 +02:00
18 changed files with 509 additions and 18 deletions

View File

@@ -152,6 +152,9 @@ PlaceholderParser* O_OBJECT_SLIC3R
Ref<PlaceholderParser> O_OBJECT_SLIC3R_T
Clone<PlaceholderParser> O_OBJECT_SLIC3R_T
MotionPlanner* O_OBJECT_SLIC3R
Ref<MotionPlanner> O_OBJECT_SLIC3R_T
Clone<MotionPlanner> O_OBJECT_SLIC3R_T
ExtrusionLoopRole T_UV
ExtrusionRole T_UV