Fixed conflicts after merge with master

This commit is contained in:
enricoturri1966
2020-06-12 10:35:18 +02:00
37 changed files with 1441 additions and 955 deletions

View File

@@ -192,6 +192,7 @@ add_library(libslic3r STATIC
MTUtils.hpp
VoronoiOffset.cpp
VoronoiOffset.hpp
VoronoiVisualUtils.hpp
Zipper.hpp
Zipper.cpp
MinAreaBoundingBox.hpp