Axel Uhl 035731d2a2 Merge branch 'master' into newhome ...

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch

2014-05-30 14:35:48 +02:00

..

.settings

…

META-INF

Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race

2014-03-28 18:34:58 +01:00

src/com/sap/sailing/server

fixed initial load serialization for remote sailing server references with proper logging

2014-05-19 23:20:03 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…

SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch

Merge branch 'master' into newhome

2014-05-30 14:35:48 +02:00

SailingServer (No Proxy, Jetty on 8889).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (No Proxy, No Tests).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (No Proxy, Remote Debug SAP VM).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (No Proxy, winddbTest).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (No Proxy).launch

Merge branch 'master' into newhome

2014-05-30 14:35:48 +02:00

SailingServer (Proxy, Jetty on 8889).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (Proxy, Remote Debug SAP VM).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (Proxy, winddbTest).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00

SailingServer (Proxy).launch

added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format

2014-05-30 10:59:39 +02:00