diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
| commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
| tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /src/CGAL_Nef_polyhedron.cc | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'src/CGAL_Nef_polyhedron.cc')
| -rw-r--r-- | src/CGAL_Nef_polyhedron.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc index 61ca2f8..8c65777 100644 --- a/src/CGAL_Nef_polyhedron.cc +++ b/src/CGAL_Nef_polyhedron.cc @@ -5,7 +5,6 @@ #include "polyset.h" #include "dxfdata.h" #include "dxftess.h" -#include <CGAL/minkowski_sum_3.h> CGAL_Nef_polyhedron::CGAL_Nef_polyhedron(CGAL_Nef_polyhedron2 *p) { |