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

2019-05-16 06:42:08 +03:00
parent 42f287e254
commit 114fada396
23 changed files with 295 additions and 306 deletions
@@ -638,6 +638,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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