fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,194 Commits 1 Branch 0 Tags
aafc0dc9dbed1fe0e01624e658cf3c76709c2018
Commit Graph
5 Commits
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
 2017-09-13 14:00:40 +12:00
fjc40 2ce84e3be4 Added myself to the .mailmap file. 2017-04-24 20:23:29 +12:00
Erika Savell fc1121b5b7 Removed extra < char from .mailmap 2017-03-29 23:07:42 +13:00
Erika Savell 9f71c99ecf Updated .mailmap 2017-03-29 23:05:36 +13:00
SENG302 fea7c98874 Added .mailmap file (includes basic info for students) 2016-07-31 14:50:37 +12:00