Fan-Wu Yang ac42c07c69 Merge branch 'master' into MapWindRotation ...

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserRace.java

2017-08-14 03:54:02 +12:00

..

src

Merge branch 'master' into MapWindRotation

2017-08-14 03:54:02 +12:00

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.

2017-07-28 09:30:26 +12:00