(ec2543ae9) Merge remote-tracking branch 'origin/x86-build' into dev

2019-05-06 11:30:17 +03:00
parent 931a6ea20b
commit 0817f8b3ef
14 changed files with 764 additions and 158 deletions
@@ -180,6 +180,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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