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

2019-05-16 06:23:10 +03:00
parent 0a4a2aa35e
commit 2aaf5c359f
11 changed files with 239 additions and 257 deletions
@@ -506,6 +506,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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