Steffen Schaefer 9b35cf574c Merge branch 'master' into bug5085 ...

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

2019-11-25 08:19:26 +01:00

..

.settings

…

META-INF

added racelogtrackingadapter to replication.test fragment's dependencies

2019-10-09 00:33:29 +02:00

src/com/sap/sailing/server/replication/test

Merge branch 'master' into bug5085

2019-11-25 08:19:26 +01:00

.classpath

…

.gitignore

…

.project

Revert "removed PluginNature from our OSGi bundles; they are not Eclipse plugins";

2019-05-28 21:54:20 +02:00

build.properties

…

pom.xml

…

ReplicationTests (No Proxy).launch

…