Alexander Tatarinovich d16d2b3eca Merge branch 'master' into bug3246 ...

Conflicts:
	java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java
	java/pom.xml

Change-Id: Ic6d8da3151e0e37adf4d16b634d20a70b7e20cc5

2016-10-24 19:17:03 +03:00

..

.settings

…

META-INF

…

schema

…

src/com/sap/sailing/xrr/resultimport

Merge branch 'master' into bug3246

2016-10-24 19:17:03 +03:00

.classpath

…

.project

…

build.properties

…

pom.xml

…