Axel Uhl dfc516021a Merge branch 'master' into bug3960

2016-12-12 08:48:54 +01:00

..

.settings

First draft of Positioning Acitivity

2015-03-23 18:12:50 +01:00

assets

reverted build.info checkin from 118ffa2

2016-04-15 08:35:49 +02:00

res

Merge branch 'master' into bug3960

2016-12-12 08:48:54 +01:00

src/com

Merge branch 'master' into bug3960

2016-12-12 08:48:54 +01:00

tests-jvm/src/com/sap/sailing/android/tracking/app/utils

activate junit tests in Shared, Tracker and Buoy projects (with some easy tests)

2015-06-19 15:29:41 +02:00

tests-ui/src/com/sap/sailing/android/tracking/app

activate junit tests in Shared, Tracker and Buoy projects (with some easy tests)

2015-06-19 15:29:41 +02:00

.classpath

merged currrent master and resolved conflicts

2016-09-30 09:24:33 +02:00

.gitignore

Changed the folders for assets and filtered assets

2015-12-09 09:01:44 +01:00

.project

…

AndroidManifest.xml

fixed lint blocker

2016-11-23 15:02:17 +01:00

build.gradle

recovered play service dependencies for android shared and tracking app as app wouldn't build otherwise

2016-09-30 13:03:07 +02:00

lint.xml

suppress the Lint warning about not targeting the latest Android release; we live with 22.2.1 as target for now

2016-05-03 15:30:18 +02:00

pom.xml

recovered play service dependencies for android shared and tracking app as app wouldn't build otherwise

2016-09-30 13:03:07 +02:00

proguard-project.txt

Merge branch 'bug2572' into android_apps

2015-01-14 17:02:18 +01:00

project.properties

recovered play service dependencies for android shared and tracking app as app wouldn't build otherwise

2016-09-30 13:03:07 +02:00