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

2019-05-16 06:47:06 +03:00
parent 9f99113dd4
commit 4b7458cc44
11 changed files with 336 additions and 186 deletions
@@ -672,6 +672,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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