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

2019-05-16 05:50:56 +03:00
parent fd7dfebd3a
commit 884360216f
45 changed files with 1679 additions and 1563 deletions
@@ -278,6 +278,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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