Axel Uhl ebb7ed03b9 Merge branch 'master' into tracapi ...

Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java

The conflict was caused by the fix that avoids null values being part of the collection returned by RaceHandleImpl.getRaces(...).
This has a relationship with bug 1903 (Change RacesHandle to RaceHandle).

2014-04-29 15:48:52 +02:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

Merge remote-tracking branch 'origin/master' into riccardo-selenium

2014-02-17 15:58:32 +01:00

src/com/sap/sailing/server

Merge branch 'master' into tracapi

2014-04-29 15:48:52 +02:00

.classpath

Merge branch 'racecommittee_integrated' of

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

.gitignore

Merge branch 'racecommittee_integrated' of

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

.project

Merge branch 'racecommittee_integrated' of

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

build.properties

Merge branch 'racecommittee_integrated' of

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

pom.xml

Merge branch 'racecommittee_integrated' of

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

SailingServer (No Proxy, Jetty on 8889, Monitoring).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (No Proxy, Jetty on 8889).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (No Proxy, No Tests).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

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

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (No Proxy, winddbTest).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (No Proxy).launch

re-added manage2sail bundle to launch configs

2014-03-22 15:50:12 +01:00

SailingServer (Proxy, Jetty on 8889).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (Proxy, Remote Debug SAP VM).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (Proxy, winddbTest).launch

added missing dataming bundles to launch configs

2014-04-07 22:16:08 +02:00

SailingServer (Proxy).launch

Merge branch 'master' into tracapi

2014-03-27 14:37:41 +01:00