Files
sailing-analytics/java/com.sap.sailing.domain.common/META-INF
Jens Rommel a03d41ae09 Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	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
2013-05-27 17:00:42 +02:00
..