Joseph Gardner 40421e5a83 Merge branch 'sprint4_master' into noDependencyArrow ...

# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
#	network/src/main/java/seng302/Networking/Messages/RaceStatus.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml

2017-05-22 15:28:53 +12:00

..

.idea

Removed breaking dependency and made it so app doesn't need the breaking dependency any more.

2017-05-22 11:49:40 +12:00

doc

Actually added sub modules this time

2017-04-20 11:16:19 +12:00

src

Merge branch 'sprint4_master' into noDependencyArrow

2017-05-22 15:28:53 +12:00

pom.xml

Removed breaking dependency and made it so app doesn't need the breaking dependency any more.

2017-05-22 11:49:40 +12:00