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 288979be3b Merge branch 'Development' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceController.java # racevisionGame/src/main/java/visualiser/app/App.java		9 years ago
..
src	Merge branch 'Development' into new_issue#19	9 years ago
pom.xml	The racevisionGame pom still had "profiles", which aren't needed with a single jar build, and the built jar didn't have a mainifest/main class.	9 years ago