Axel Uhl 44def3c6c6 Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_positioning_app--develop ...

Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java

2015-03-30 17:26:38 +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 'ubilabs--buoy_positioning_app--bugfix--ui_improvements' into ubilabs--buoy_positioning_app--develop

2015-03-27 15:37:08 +01:00

src/com/sap/sailing/android

Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_positioning_app--develop

2015-03-30 17:26:38 +02:00

.classpath

Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_positioning_app--develop

2015-03-30 17:26:38 +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

Merge branch 'master' into android_apps

2015-01-21 15:20:56 +01:00

build.gradle

Removes Hockey SDK

2015-03-30 14:24:03 +02:00

lint.xml

Android apps can be compiled within Eclipse

2015-02-10 09:20:42 +01:00

pom.xml

removed Hockey dependency; removed Volley from pom.xml; added org.json.simple dependency

2015-03-25 21:01:19 +01:00

proguard-project.txt

renamed glue project to android.shared

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

project.properties

Second extraction

2015-03-18 17:25:23 +01:00