Files
sailing-analytics/java/com.sap.sailing.domain.test
Frederik Petersen 8f21a28049 Merge branch 'master' into polars
Conflicts:
	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
2013-10-23 09:02:33 +02:00
..