SENG302

Author	SHA1	Message	Date
hba56	70ccb4cf1c	Merge remote-tracking branch 'remotes/origin/master' into story77 # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml	8 years ago
fjc40	2ce84e3be4	Added myself to the .mailmap file.	9 years ago
Erika Savell	fc1121b5b7	Removed extra < char from .mailmap	9 years ago
Erika Savell	9f71c99ecf	Updated .mailmap	9 years ago
SENG302	fea7c98874	Added .mailmap file (includes basic info for students)	10 years ago