Files
sailing-analytics/java
fmittag 0a0fe8147a Merge remote-tracking branch 'origin/master' into buoyzone_drawing
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapSettingsDialogComponent.java
2013-01-29 10:38:51 +01:00
..