Merge branch 'master' into bug2822_boatcolors

This commit is contained in:
Axel Uhl
2018-03-24 08:49:11 +01:00
161 changed files with 179 additions and 95 deletions
@@ -22,3 +22,4 @@ Import-Package: com.sap.sailing.server.operationaltransformation,
org.json.simple,
org.json.simple.parser,
org.osgi.framework;version="1.7.0"
Automatic-Module-Name: com.sap.sailing.xrr.structureimport