Steffen Schäfer 67d310df4b Merge branch 'master' into bug2822_boatcolors ...

# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
#	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java

2017-05-16 15:59:24 +02:00

..

.settings

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +02:00

META-INF

Merge branch 'master' into bug2447

2017-01-09 10:05:05 +01:00

src/com/sap/sailing/mongodb/test

Merge branch 'master' into bug2822_boatcolors

2017-05-16 15:59:24 +02:00

.classpath

upgraded classpaths to JavaSE-1.8

2014-10-01 14:16:18 +02:00

.gitignore

…

.project

…

build.properties

…

pom.xml

…