Vladislav Chumak 67bf7356e1 Merge remote-tracking branch 'origin/master' into bug3529 ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/SailingAnalyticsNotes.html

2017-04-13 17:58:56 +02:00

..

.settings

…

META-INF

Using junit and hamcrest from orbit / adjustments for different junit

2016-11-24 13:29:02 +01:00

src/com/sap/sse/common

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

2017-04-13 17:58:56 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…