Axel Uhl 45deabb347 Merge branch 'master' into axel-usermanagement ...

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java

Part of the conflict resolution was to include UserManagementService and UserService in the newhome application factories to pass them to AutoPlayer

2014-10-17 09:49:59 +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

upgraded manifests from JavaSE-1.7 to JavaSE-1.8 as runtime environment

2014-10-01 14:08:19 +02:00

src/com/sap/sailing/domain/racelogtracking

fix erroneous setting of tracking start and end times

2014-10-15 21:45:30 +02:00

WEB-INF

add additional servlet to receive fixes in flat JSON serialization

2014-10-09 18:05:25 +02:00

.classpath

upgraded classpaths to JavaSE-1.8

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

.gitignore

KW Safe commit

2014-06-24 11:57:03 +02:00

.project

…

build.properties

…

pom.xml

…