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

2019-05-16 06:36:01 +03:00
parent 420a673653
commit a8b1da225b
11 changed files with 415 additions and 83 deletions
@@ -596,6 +596,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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