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

2019-05-16 06:28:06 +03:00
parent e39043dbf5
commit 70ff950d38
11 changed files with 333 additions and 117 deletions
@@ -540,6 +540,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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