Axel Uhl ba47883a59 Merge branch 'master' into mark-rounding-inference ...

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

2015-03-27 15:39:19 +01:00

..

.settings

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +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/sailing/server

Merge branch 'master' into mark-rounding-inference

2015-03-27 15:39:19 +01:00

.classpath

upgraded classpaths to JavaSE-1.8

2014-10-01 14:16:18 +02:00

.gitignore

…

.project

…

build.properties

…

pom.xml

…

SailingServer (No Proxy, Cached MTB).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

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

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (No Proxy, Jetty on 8889).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (No Proxy, Jetty on 8890).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

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

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (No Proxy, winddbTest).launch

added mgwt and dashboard to launch config

2015-03-20 08:46:53 +01:00

SailingServer (No Proxy).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (Proxy, Jetty on 8889).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (Proxy, winddbTest).launch

added dashboard and mgwt bundle to server launch configs

2015-03-20 10:14:48 +01:00

SailingServer (Proxy).launch

added settings dialog component entry for start to next mark lines; added mgwt and ribdashboard to bundle list

2015-03-19 18:03:08 +01:00