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
parent 2a6085c9e8 83c1aeba50
commit 55402136ed
80 changed files with 2463 additions and 2985 deletions
@@ -183,3 +183,4 @@ local.properties
 # IntelliJDEA ignore
 *.iml
 dedicatedServer/.idea/
+settings/keyBindings.xml