Lennart Hensler 0ccdb93814 Merge remote-tracking branch 'extern/master' into dataMining ...

Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target

2013-10-02 13:48:48 +02:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

moved a few more distance and speed types to domain.common and fixed a grave bug in MeterPerSecondSpeed; added test for improved outlier filtering

2013-08-14 18:00:45 +02:00

src/com/sap/sailing

Merge remote-tracking branch 'extern/master' into dataMining

2013-10-02 13:48:48 +02:00

.classpath

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