Axel Uhl 8ee18e9ae5 Merge branch 'master' into bug3246; this merge temporarily kills the addition of the competitor import bundle to the launch configs ...

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).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

Change-Id: I88164350550d862bf9feed4d127a2d773d064add

2016-12-07 17:47:05 +01: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

feature.xml

Merge branch 'master' into bug3246; this merge temporarily kills the addition of the competitor import bundle to the launch configs

2016-12-07 17:47:05 +01:00

pom.xml

Merge branch 'racecommittee_integrated' of

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