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/node.cc | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/node.cc')
| -rw-r--r-- | src/node.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/node.cc b/src/node.cc index e2f3fa0..12a7ca4 100644 --- a/src/node.cc +++ b/src/node.cc @@ -24,17 +24,13 @@ * */ -#include "printutils.h" #include "node.h" #include "module.h" -#include "csgterm.h" #include "progress.h" -#include "polyset.h" #include "visitor.h" -#include "nodedumper.h" #include "stl-utils.h" -#include <sstream> +#include <iostream> #include <algorithm> size_t AbstractNode::idx_counter; |