Merge branch 'master' of github.com:teamfisk/TacticalZ

2016-03-12 23:49:44 +01:00
parent 2bfbd72189 1e7f6941ba
commit 7ea90bede7
23 changed files with 320 additions and 174 deletions
@@ -19,6 +19,7 @@ class Resource

 protected:
 	Resource() { }
+    virtual ~Resource() = default;

 public:
    //Should be thrown in a Resource's constructor if it cannot complete because another resource is still loading.