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

2019-05-16 06:39:48 +03:00
parent 5a4f50cfd2
commit 4690c441e3
12 changed files with 166 additions and 311 deletions
@@ -622,6 +622,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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