Files
sailing-analytics/java/com.sap.sailing.domain.test
Axel Uhl 15d5f9d27a Merge branch 'master' into map_sidelines
Conflicts:
	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
2013-07-03 17:37:36 +02:00
..