Files
sailing-analytics/java
Lennart Hensler 71351dad49 Merge remote-tracking branch 'origin/master' into trackedRaceExtensions
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/DummyTrackedRace.java
2013-09-06 13:23:24 +02:00
..
2013-08-23 17:53:43 +01:00