zwu18 c3ea62dfee Merge branch 'master' into CommandFactory ...

# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

2017-08-12 03:18:24 +12:00

..

src

Merge branch 'master' into CommandFactory

2017-08-12 03:18:24 +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