Axel Uhl 3917060c1a Merge branch 'master' into android-maven-build-bug3190 ...

Conflicts:
	java/pom.xml

Change-Id: I8707442d05979fcd8e0a8be0b593ee3e94a513d3

2016-01-12 12:47:30 +01:00

..

.settings

UTF-8 settings for CountryCodeFactory

2015-01-24 15:14:42 +01:00

META-INF

removed version specificity for datamining.annotations dependency in com.sap.sse.commong

2015-12-09 14:45:24 +01:00

src/com/sap/sse

Moved media model and util to com.sap.sse.shared.android project because

2015-11-24 11:40:32 +01:00

.classpath

updated the *.common projects to JavaSE-1.7 as their execution environment now that we use the Android build tools that are 1.7-capable

2015-01-22 11:10:58 +01:00

.gitignore

KW Safe commit

2014-06-24 11:57:03 +02:00

.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