Files
sailing-analytics/java/com.sap.sailing.server.gateway.serialization/META-INF
Frederik Petersen 5963984323 Merge branch 'master' into import_dbdata
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-06-29 10:46:20 +02:00
..