Merge branch 'master' into space-map-checking

2015-04-07 12:18:23 +01:00
parent 50d1a3e7d2 7f643b7050
commit ee200ba85b
168 changed files with 7851 additions and 2250 deletions
--- a/persistent-data/space_map.h
+++ b/persistent-data/space_map.h
@@ -119,6 +119,7 @@ namespace persistent_data {

 	namespace space_map_detail {
 		class damage {
+		public:
 			virtual ~damage() {}
 		};