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

2019-05-16 06:30:06 +03:00
parent e074a5bf73
commit 531a1235af
12 changed files with 239 additions and 272 deletions
@@ -554,6 +554,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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