Axel Uhl f57aed7de6 Merge branch 'master' into bug3420 ...

Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java

Change-Id: I7347ab0c849aa43f08eebca569c884b6986bf6d0

2016-01-22 15:39:16 +01:00

..

.settings

major refactoring, solving bug 2578 by introducing com.sap.sse.shared.android and moving useful stuff to it that will compile on Android

2015-01-22 10:57:00 +01:00

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 bug3420

2016-01-22 15:39:16 +01:00

.classpath

major refactoring, solving bug 2578 by introducing com.sap.sse.shared.android and moving useful stuff to it that will compile on Android

2015-01-22 10:57:00 +01:00

.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