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

2019-05-16 06:39:14 +03:00
parent f4c4fd2a23
commit 82a3e21510
11 changed files with 145 additions and 315 deletions
@@ -618,6 +618,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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