5 Commits (b1e55f8c7ddea3e69fada1cd8890a0ff66e3c03f)

Author SHA1 Message Date
Erika Savell b1e55f8c7d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28
9 years ago
Joseph Gardner fc15c3d151 Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759]
9 years ago
hba56 f5472bf595 Merge remote-tracking branch 'remotes/origin/master' into story28
9 years ago
Erika Savell f25e2bac32 Changed countdown length to two minutes
9 years ago
Erika Savell 0772ca22c6 Re-engineered fxml controllers to use child controllers
9 years ago