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

2019-05-16 06:05:33 +03:00
parent 36ee088738
commit c1d1cf442f
12 changed files with 135 additions and 1118 deletions
@@ -382,6 +382,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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