fjc40 3a0bd10a57 Merge remote-tracking branch 'origin/master' into story_61 ...

# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
#	racevisionGame/src/main/resources/visualiser/scenes/race.fxml

2017-08-15 14:49:58 +12:00

..

src

Merge remote-tracking branch 'origin/master' into story_61

2017-08-15 14:49:58 +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