Frederik Petersen 5a929c8bb9 Merge branch 'master' into polar-api ...

Conflicts:
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch

2014-03-07 10:21:37 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

src/com/sap/sailing/server

Merge branch 'master' into polar-api

2014-03-06 10:47:26 +01: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

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (No Proxy, Jetty on 8889).launch

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (No Proxy, No Tests).launch

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

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

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (No Proxy, winddbTest).launch

corrected manifest.mf for gateway.test.support bundle and added autostart property to ensure that this web bundle is always running

2014-03-06 16:00:59 +01:00

SailingServer (No Proxy).launch

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (Proxy, Jetty on 8889).launch

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

Merge branch 'master' into polar-api

2014-02-26 12:31:44 +01:00

SailingServer (Proxy, winddbTest).launch

Merge branch 'master' into polar-api

2014-03-07 10:21:37 +01:00

SailingServer (Proxy).launch

Merge branch 'master' into polar-api

2014-03-06 10:47:26 +01:00