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

2019-05-16 06:00:45 +03:00
parent aad4b64014
commit e019b0e3d5
12 changed files with 331 additions and 67 deletions
@@ -348,6 +348,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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