Axel Uhl 911cdeb86b Merge branch 'master' into jbross-buoy-tender ...

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java

2015-03-23 20:52:00 +01:00

..

.settings

upgraded com.sap.sailing.server.gateway.serialization to JavaSE-1.8 after Android-relevant pieces have been moved to com.sap.sailing.server.gateway.serialization.shared.android

2015-01-14 13:34:10 +01:00

META-INF

upgraded all Mongo-using bundles to 2.13.0 driver

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

src/com/sap/sailing/server/gateway

Merge branch 'master' into jbross-buoy-tender

2015-03-23 20:52:00 +01:00

.classpath

upgraded com.sap.sailing.server.gateway.serialization to JavaSE-1.8 after Android-relevant pieces have been moved to com.sap.sailing.server.gateway.serialization.shared.android

2015-01-14 13:34:10 +01:00

.gitignore

fixed a bunch of NPE issues in the RCapp

2014-01-27 10:26:59 +01:00

.project

…

build.properties

…

pom.xml

added pom.xml for com.sap.sailing.server.gateway.serialization.shared.android

2015-01-14 13:37:48 +01:00