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

2019-05-06 11:35:46 +03:00
parent 26eaf244ed
commit 029f5fccda
14 changed files with 281 additions and 66 deletions
@@ -200,6 +200,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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