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

2019-05-03 13:44:21 +03:00
parent 35f4657ea1
commit c988016b6f
6 changed files with 310 additions and 53 deletions
@@ -40,6 +40,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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