Steffen Schaefer 526bfb32b5 Merge remote-tracking branch 'origin/master' into foiling ...

Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java

2016-04-21 09:23:17 +02:00

..

.settings

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +02:00

META-INF

Moved media model and util to com.sap.sse.shared.android project because

2015-11-24 11:40:32 +01:00

src/com/sap/sailing/mongodb/test

Merge remote-tracking branch 'origin/master' into foiling

2016-04-21 09:23:17 +02:00

.classpath

upgraded classpaths to JavaSE-1.8

2014-10-01 14:16:18 +02:00

.gitignore

…

.project

…

build.properties

…

pom.xml

…