Merge remote-tracking branch 'remotes/origin/master' into story77

# Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java # settings/keyBindings.xml
2017-09-13 16:13:14 +12:00
parent 22b4b66049 7b97e93d3a
commit fd120edaf9
43 changed files with 910 additions and 374 deletions
@@ -26,7 +26,6 @@ import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import mock.app.Event;

-
 public class App extends Application {
    private static Stage stage;
    public static Event game;