Axel Uhl 3a698ab60d Merge branch 'master' into ubilabs--rcapp--develop ...

Conflicts:
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java

2015-06-17 01:05:03 +02:00

..

.settings

removing discrepancies to master (old 1.6 android compiler settings somehow appeared)

2015-01-23 20:09:53 +01:00

res

Merge branch 'master' into ubilabs--rcapp--develop

2015-06-16 11:03:35 +02:00

src/com/sap/sailing/android

Merge branch 'master' into ubilabs--rcapp--develop

2015-06-17 01:05:03 +02:00

.classpath

Updated Play Services to version 7.3 and external libs for Eclipse build

2015-05-06 13:47:23 +02:00

.gitignore

ignore gen folder

2014-10-05 16:09:08 +02:00

.project

renamed glue project to android.shared

2014-10-04 11:03:15 +02:00

AndroidManifest.xml

revert some more whitespace changes

2015-04-30 15:52:54 +02:00

build.gradle

Updated Play Services to version 7.3 and external libs for Eclipse build

2015-05-06 13:47:23 +02:00

lint.xml

Merge branch 'master' into ubilabs--rcapp--develop

2015-05-06 11:32:59 +02:00

pom.xml

Revert "adding white space mess "

2015-04-30 11:54:47 +02:00

proguard-project.txt

renamed glue project to android.shared

2014-10-04 11:03:15 +02:00

project.properties

Merge branch 'master' into ubilabs--rcapp--develop

2015-05-06 11:32:59 +02:00