Files
sailing-analytics/java/com.sap.sse.gwt.theme/META-INF
Steffen Schaefer d391c4512d Merge remote-tracking branch 'origin/design2015-overview' into
design2015

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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/SailingFlagsBuilder.java
2015-05-26 12:39:20 +02:00
..