Axel Uhl 133fcdaa58 Merge branch 'master' into bug3785 ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/Home.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java

Change-Id: I73298972a7761dc6580154ecc83d5eda1b39fadc

2016-07-18 13:06:54 +02:00

..

.settings

Merge remote-tracking branch 'origin/master' into bug2610_lifecycle

2016-05-13 13:51:23 +02:00

META-INF

Merge remote-tracking branch 'origin/master' into bug2775

2016-06-09 16:32:49 +02:00

resources/com/sap/sse/gwt/client

…

src/com

Merge branch 'master' into bug3785

2016-07-18 13:06:54 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…