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
14 changed files with 127 additions and 16 deletions

View File

@@ -10,6 +10,8 @@ extern "C" {
#include <math.h>
namespace Slic3r {
class Point
{
public:
@@ -36,4 +38,6 @@ point2perl(Point& point) {
return sv_bless(newRV_noinc((SV*)av), gv_stashpv("Slic3r::Point", GV_ADD));
}
}
#endif