Steffen Schaefer eb66480c9f Merge branch 'master' into foiling ...

Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java

2016-06-17 14:32:19 +02:00

..

.settings

…

META-INF

a failing test case for replicating the effects of a master data import with media tracks; some test refactoring and a new testsupport bundle

2016-06-10 16:31:05 +02:00

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

Merge branch 'master' into foiling

2016-06-17 14:32:19 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…

ReplicationTests (No Proxy).launch

…

ReplicationTests (Proxy).launch

…