fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ...

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java

Also added keybindings.xml to git ignore.
#story[1185]

2017-09-13 12:04:32 +12:00

..

java

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

2017-09-13 12:04:32 +12:00

resources

Test fix.

2017-09-13 00:52:35 +12:00