Steffen Schaefer e07c585934 Merge remote-tracking branch 'origin/master' into design2015 ...

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch

2015-05-28 09:55:11 +02: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 remote-tracking branch 'origin/master' into design2015

2015-05-28 09:55:11 +02: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

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

build.gradle

Merge branch 'bug2572' into android_apps

2015-01-14 17:02:18 +01:00

build.properties

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

pom.xml

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

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