Files
sailing-analytics/java/com.sap.sailing.domain.shared.android.test
Steffen Schaefer 0a1b56765c Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
2016-06-27 16:15:41 +02:00
..
…
…