Files
sailing-analytics/java
Steffen Schaefer de5e5a34a3 Merge remote-tracking branch 'origin/master' into foiling
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java
2016-09-26 15:37:20 +02:00
..
…