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

2019-05-16 06:27:16 +03:00
parent a6b592a625
commit 1cdd62360f
13 changed files with 169 additions and 277 deletions
@@ -534,6 +534,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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