Fredrik Teschke 4b4b61b6c5 Merge remote-tracking branch 'origin/master' into ftes-rltracking ...

Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

2014-05-09 20:30:32 +02:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

Merge branch 'master' into gpsfixstore-independent-of-race

2014-02-12 21:58:31 +01:00

src/com/sap/sailing/server/gateway

Merge remote-tracking branch 'origin/master' into ftes-rltracking

2014-05-09 20:30:32 +02:00

.classpath

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02: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

Revert "fixes in POMs to allow GWT client side to access code in serialization bundle"

2014-02-26 14:44:00 +01:00