Fredrik Teschke d693090d81 Merge branch 'master' into regatta-log ...

Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMappingFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/DeviceMappingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java

2014-12-24 12:45:22 +01:00

..

.settings

Revert "Fix classpath settings of domain.shared.android"

2014-12-05 13:59:47 +01:00

META-INF

use regattalog in RaceLogRaceTracker and TrackedRace

2014-12-05 10:13:24 +01:00

src/com/sap/sailing

Merge branch 'master' into regatta-log

2014-12-24 12:45:22 +01:00

.classpath

Revert "Fix classpath settings of domain.shared.android"

2014-12-05 13:59:47 +01:00

.gitignore

fixed a bunch of NPE issues in the RCapp

2014-01-27 10:26:59 +01: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

Fiddlig with Java 8 compiler settings...

2014-10-17 11:40:54 +02:00