(19b26d13b) Merge branch 'dev' into human-ai

2019-05-16 05:08:39 +03:00
parent 454dda56c7
commit 616efac2bf
14 changed files with 150 additions and 134 deletions
@@ -24,6 +24,8 @@ namespace Barotrauma

        private bool removed;

+        private bool removed;
+
 #if CLIENT
        private List<Decal> burnDecals = new List<Decal>();
 #endif