Steffen Schaefer aca8d00b84 Merge branch 'master' into bug5085 ...

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

2019-11-05 06:40:13 +01:00

..

.settings

set BoatClassMasterdata character encoding to UTF-8

2019-09-26 21:13:51 +02:00

META-INF

Moved parts of the ORC module to domain.commons. Added ORCLegDataAnalyzer.

2019-07-30 16:30:52 +02:00

src/com/sap/sailing/domain

Merge branch 'master' into bug5085

2019-11-05 06:40:13 +01:00

.classpath

switched remaining projects from JavaSE-1.7 to JavaSE-1.8

2019-04-05 22:40:16 +02:00

.gitignore

…

.project

Revert "removed PluginNature from our OSGi bundles; they are not Eclipse plugins";

2019-05-28 21:54:20 +02:00

AndroidManifest.xml

…

build.gradle

…

build.properties

…

pom.xml

…