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

2019-05-16 06:10:58 +03:00
parent 35cea7ae25
commit 5709b505d6
11 changed files with 330 additions and 115 deletions
@@ -420,6 +420,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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