Axel Uhl 5073ea75d7 Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes ...

Change-Id: I61c922f7a1d7ece025ace4cd6277ccce3640d055

2018-01-16 11:24:13 +01:00

..

.settings

normalized line endings

2017-05-16 09:42:02 +02:00

META-INF

Removed the main/sub key from CompoundGroupKey. Just list of keys now

2015-10-31 00:49:39 +01:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes

2018-01-16 11:24:13 +01:00

.classpath

normalized line endings

2017-05-16 09:42:02 +02:00

.gitignore

…

.project

normalized line endings

2017-05-16 09:42:02 +02:00

build.gradle

Merge branch 'bug2572' into android_apps

2015-01-14 17:02:18 +01:00

build.properties

normalized line endings

2017-05-16 09:42:02 +02:00

pom.xml

normalized line endings

2017-05-16 09:42:02 +02:00