Steffen Schaefer 0a1b56765c Merge branch 'master' into foiling ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java

2016-06-27 16:15:41 +02:00

..

.settings

shared.android.test -> JavaSE-1.8 (prevent class version errors when launching tests in Eclipse)

2014-10-21 09:23:07 +02:00

META-INF

upgraded all Mongo-using bundles to 2.13.0 driver

2015-02-12 16:00:15 +01:00

src/com/sap

Merge branch 'master' into foiling

2016-06-27 16:15:41 +02:00

.classpath

shared.android.test -> JavaSE-1.8 (prevent class version errors when launching tests in Eclipse)

2014-10-21 09:23:07 +02:00

.project

…

build.properties

…

pom.xml

…