Fan-Wu Yang 7546c65893 Merge branch 'master' into MapWindRotation ...

# Conflicts:
#	racevisionGame/src/main/java/shared/model/CompoundMark.java
#	racevisionGame/src/main/java/shared/model/Mark.java

2017-08-17 12:59:54 +12:00

..

src

Merge branch 'master' into MapWindRotation

2017-08-17 12:59:54 +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