Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
William Muir
2017-09-28 16:04:04 +13:00
24 changed files with 107 additions and 711 deletions
@@ -108,10 +108,6 @@ public class MapMaker {
return mapPreviews.get(index).getAssets();
}
public RaceXMLData getCurrentRace() {
return races.get(index);
}
public RegattaXMLData getCurrentRegatta() {
return regattas.get(index);
}