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.

David Wu f8147be4df Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Constants.java # src/main/java/seng302/Model/Race.java # src/main/java/seng302/Model/ResizableRaceCanvas.java		9 years ago
..
Boat.java	Merge remote-tracking branch 'origin/story9' into story9	9 years ago
BoatInRace.java	Back to string properties	9 years ago
ConstantVelocityRace.java	Tests for calculating leg distance and updating boat positions added	9 years ago
Leg.java	Tests for calculating leg distance and updating boat positions added	9 years ago
Race.java	Merge remote-tracking branch 'origin/story9' into story9	9 years ago
ResizableRaceCanvas.java	Merge remote-tracking branch 'origin/story9' into story9	9 years ago