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

2019-05-16 06:34:36 +03:00
parent 8bf054ef2a
commit 72adf9e4f7
12 changed files with 170 additions and 301 deletions
@@ -586,6 +586,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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