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

2019-05-03 13:56:13 +03:00
parent b0947d4bf8
commit 925329956a
4 changed files with 297 additions and 53 deletions
@@ -124,6 +124,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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