Merge remote branch 'upstream/master' into cakebaby

Conflicts:
	tests/CMakeLists.txt
	tests/csgtestcore.cc

1 files changed, 1 insertions, 1 deletions

diff --git a/src/Tree.h b/src/Tree.h
index 41ae613..938353b 100644
--- a/src/Tree.h
+++ b/src/Tree.h
@@ -13,7 +13,7 @@ class Tree
 {
 public:
 	Tree(const AbstractNode *root = NULL) : root_node(root) {}
-	~Tree() {}
+	~Tree();
 
 	void setRoot(const AbstractNode *root);
 	const AbstractNode *root() const { return this->root_node; }