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 /tests/cgalpngtest.cc | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'tests/cgalpngtest.cc')
| -rw-r--r-- | tests/cgalpngtest.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index 7aa4b25..608fb08 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -54,10 +54,6 @@ #include <assert.h> #include <sstream> -#ifdef ENABLE_CGAL -#include <CGAL/assertions_behaviour.h> -#endif - std::string commandline_commands; QString currentdir; QString examplesdir; |