Axel Uhl d51143f077 Merge branch 'master' into bug3916 ...

Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java

Change-Id: I679391487b85c85abdf8e100b72829b1947a2ff1

2016-11-29 18:06:38 +01:00

..

.settings

…

META-INF

refactoring of RRS26 and SWC racing procedure to share common functions through a shared LineStart racing procedure

2016-11-14 11:32:03 +01:00

src/com/sap/sailing/domain

Merge branch 'master' into bug3916

2016-11-29 18:06:38 +01:00

.classpath

…

.gitignore

…

.project

…

AndroidManifest.xml

Consistently using targetSdkVersion 22 in all AndroidManifest.xml files

2015-11-11 13:34:21 +01:00

build.gradle

datamining.shared was replaced by datamining.annotations for android

2015-09-17 17:22:40 +02:00

build.properties

…

pom.xml

Merge branch 'master' into android-maven-build-bug3190

2015-11-30 15:02:06 +01:00