diff options
author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/projection.cc | |
parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/projection.cc')
-rw-r--r-- | src/projection.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/projection.cc b/src/projection.cc index 2c9d821..1333d19 100644 --- a/src/projection.cc +++ b/src/projection.cc @@ -29,19 +29,9 @@ #include "context.h" #include "printutils.h" #include "builtin.h" -#include "dxfdata.h" -#include "dxftess.h" -#include "polyset.h" -#include "export.h" -#include "progress.h" #include "visitor.h" #include "PolySetEvaluator.h" -#ifdef ENABLE_CGAL -# include <CGAL/assertions_behaviour.h> -# include <CGAL/exceptions.h> -#endif - #include <assert.h> #include <sstream> #include <boost/assign/std/vector.hpp> |