Files
sailing-analytics/java
Christopher Ronnewinkel (D036654) b3549d7470 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2015-10-19 21:06:18 +02:00
..
2015-09-16 15:32:22 +02:00