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

2019-05-16 06:55:26 +03:00
parent 106c61ca9a
commit 5435adc9b4
16 changed files with 218 additions and 112 deletions
@@ -728,6 +728,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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