Merge branch 'master' into new_issue#19

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
2017-08-17 17:00:39 +12:00
parent 598275591f 0490237c0c
commit 5234cdea66
48 changed files with 174 additions and 108 deletions
@@ -91,7 +91,6 @@ public class Event {
        //Read XML files.
        try {
            this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90);
-            //this.raceXML = XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8);
            this.boatXML = XMLReader.readXMLFileToString(boatsXMLFile, StandardCharsets.UTF_8);
            this.regattaXML = XMLReader.readXMLFileToString(regattaXMLFile, StandardCharsets.UTF_8);