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

2019-05-16 06:10:23 +03:00
parent 5cedf373d6
commit 1eb58ddf55
15 changed files with 421 additions and 81 deletions
@@ -416,6 +416,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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