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

2019-05-16 06:54:13 +03:00
parent 7c2c31d8d8
commit 2a1ed98226
13 changed files with 148 additions and 36 deletions
@@ -720,6 +720,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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