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

2019-05-03 13:52:49 +03:00
parent 7545e8efec
commit c01eddbebb
5 changed files with 314 additions and 71 deletions
@@ -100,6 +100,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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