Axel Uhl a6979dc343 Merge branch 'master' into bug3556 ...

Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: I5de0b021ea379792fc0d6f81797adc487ba23bee

2016-04-06 23:20:45 +02:00

..

.settings

…

META-INF

Revert "upgraded versions to 1.1.0"

2015-11-10 17:10:14 +01:00

src/com/sap/sailing/domain

Merge branch 'master' into bug3556

2016-04-06 23:20:45 +02: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