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

2019-05-16 05:55:07 +03:00
parent 0bb541bce8
commit 093f4ce8a6
12 changed files with 391 additions and 96 deletions
@@ -308,6 +308,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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