Fixed conflicts after merge with master

2020-05-27 10:32:02 +02:00
parent aa04f0e555 e6317cdefb
commit 2eb4b2caed
68 changed files with 467 additions and 1030 deletions
--- a/xs/xsp/PerimeterGenerator.xsp
+++ b/xs/xsp/PerimeterGenerator.xsp
@@ -3,6 +3,7 @@
 %{
 #include <xsinit.h>
 #include "libslic3r/PerimeterGenerator.hpp"
+#include "libslic3r/Layer.hpp"
 %}

 %name{Slic3r::Layer::PerimeterGenerator} class PerimeterGenerator {