You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Fan-Wu Yang a3ccd75f4c Merge remote-tracking branch 'origin/sprint4_master' into Story877 ... # Conflicts: # mock/src/main/java/seng302/DataInput/BoatXMLReader.java # mock/src/main/java/seng302/DataInput/XMLReader.java # mock/src/main/java/seng302/Model/Boat.java # mock/src/main/java/seng302/Model/CompoundMark.java # mock/src/main/java/seng302/Model/Leg.java # mock/src/main/java/seng302/Model/Mark.java # mock/src/main/java/seng302/Model/Marker.java # mock/src/main/java/seng302/Model/Race.java # mock/src/test/java/seng302/Model/LegTest.java # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java # visualiser/src/main/resources/scenes/race.fxml		9 years ago
..
main	Merge remote-tracking branch 'origin/sprint4_master' into Story877	9 years ago
test	Did some large tidy ups, refactoring, and documenting.	9 years ago