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

2019-05-16 06:09:15 +03:00
parent fbe0832b1e
commit 4142815f52
14 changed files with 361 additions and 115 deletions
@@ -408,6 +408,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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