Nick Klose e511cd7f2f Merge branch 'master' into marks ...

Conflicts:
	java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java

2013-12-04 10:18:59 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

doc

First working version.

2012-12-04 10:35:59 +01:00

META-INF

first half-way reasonable start/finish line advantage display; still need to move this to TrackedRace

2013-10-25 22:31:38 +02:00

src/com/sap/sailing/domain/swisstimingreplayadapter

Merge branch 'master' into marks

2013-12-04 10:18:59 +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