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

2019-05-16 06:43:15 +03:00
parent b7e8407df5
commit 3d7b229385
18 changed files with 154 additions and 319 deletions
@@ -646,6 +646,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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