(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -20,8 +20,6 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

-        private GUILayoutGroup subPreviewContainer;
-
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;