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.

Joseph Gardner d977d3f146 Merge branch 'visualiserAndDataLink' into splitIntoTwoModules ... # Conflicts: # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Controllers/StartController.java # visualiser/src/main/java/seng302/Mock/BoatXMLReader.java # visualiser/src/main/java/seng302/Mock/StreamedBoat.java # visualiser/src/main/java/seng302/Mock/StreamedCourse.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/BoatInRace.java # visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java # visualiser/src/main/java/seng302/Model/Race.java # visualiser/src/main/java/seng302/RaceXMLReader.java # visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java		9 years ago
..
.idea	Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]	9 years ago
doc	Actually added sub modules this time	9 years ago
src	Merge branch 'visualiserAndDataLink' into splitIntoTwoModules	9 years ago
pom.xml	Renamed some directories, optimized imports, general code clean up	9 years ago