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/openscad.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/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 67112d8..0d5b25e 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -42,7 +42,6 @@ #ifdef ENABLE_CGAL #include "CGAL_Nef_polyhedron.h" -#include <CGAL/assertions_behaviour.h> #include "CGALEvaluator.h" #include "PolySetCGALEvaluator.h" #endif |