Merge branch 'master' into xsdata

Conflicts:
	lib/Slic3r/GCode.pm
	xs/src/Point.hpp
This commit is contained in:
Alessandro Ranellucci 2013-07-13 21:00:19 +02:00
commit 31809d473f
14 changed files with 127 additions and 16 deletions

View file

@ -10,6 +10,8 @@ extern "C" {
#include "Point.hpp"
namespace Slic3r {
typedef std::vector<Point> Polygon;
typedef std::vector<Polygon> Polygons;
@ -98,4 +100,6 @@ polygon2perl(Polygon& poly) {
return sv_bless(newRV_noinc((SV*)av), gv_stashpv("Slic3r::Polygon", GV_ADD));
}
}
#endif