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

2019-05-16 06:56:01 +03:00
parent f38aa90847
commit 89dc85adce
16 changed files with 227 additions and 83 deletions
@@ -732,6 +732,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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