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

First draft of Positioning Acitivity

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

assets

Changed the folders for assets and filtered assets

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

res

Align knots text next to value in speed fragment

2015-07-10 11:00:50 +02:00

src/com

consolidate import to clear warnings

2016-01-11 12:59: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

Enabled mobile tests execution through maven

2015-10-06 15:08:23 +02:00

.gitignore

Changed the folders for assets and filtered assets

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

.project

…

AndroidManifest.xml

Applied code formatting.

2015-04-16 11:16:11 +02:00

build.gradle

optimize build scripts

2015-07-14 10:51:04 +02:00

lint.xml

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

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

pom.xml

Changed activation condition for real codesinging to ldi.releaseType ==

2015-12-09 11:24:13 +01:00

proguard-project.txt

Merge branch 'bug2572' into android_apps

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

project.properties

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

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