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

2019-05-16 06:04:57 +03:00
parent 24be77b15e
commit 92e4c824f4
11 changed files with 157 additions and 235 deletions
@@ -378,6 +378,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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