Steffen Schaefer fca622efa7 Merge branch 'master' into android-maven-build-bug3190 ...

Conflicts:
	java/com.sap.sailing.domain.common/pom.xml
	java/com.sap.sailing.domain.shared.android/pom.xml
	java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml
	java/com.sap.sse.common/pom.xml
	java/com.sap.sse.datamining.annotations/pom.xml
	java/com.sap.sse.security.common/pom.xml
	java/org.json.simple/pom.xml
	java/pom.xml
	mobile/com.sap.sailing.android.shared/pom.xml
	mobile/com.sap.sailing.racecommittee.app/pom.xml
	mobile/pom.xml
	pom.xml

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

..

.settings

Forgot to change the build config to java 1.7

2015-09-17 13:38:58 +02:00

META-INF

Revert "upgraded versions to 1.1.0"

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

src/com/sap/sse/datamining

removed Unit concept from data mining

2015-09-25 16:31:16 +02:00

.classpath

Forgot to change the build config to java 1.7

2015-09-17 13:38:58 +02:00

.project

…

AndroidManifest.xml

Consistently using targetSdkVersion 22 in all AndroidManifest.xml files

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

build.gradle

Fixed gradle build files for new datamining dependencies

2015-09-17 15:33:39 +02:00

build.properties

…

pom.xml

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

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