(b3637fc6c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:32:22 +03:00
parent 9da8a437eb
commit 2215c2fba0
12 changed files with 155 additions and 308 deletions
@@ -570,6 +570,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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