D067890 cadabc0a82 Merge branch 'master' into bug4104 ...

# Conflicts:
#	java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
#	java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java

2018-07-18 16:16:58 +02:00

..

.settings

…

META-INF

added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule

2018-03-24 01:45:37 +01:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into bug4104

2018-07-18 16:16:58 +02:00

.classpath

…

.project

…

AndroidManifest.xml

…

build.gradle

…

build.properties

…

pom.xml

…