Axel Uhl 04fa3d5447 Merge branch 'master' into ubilabs--tracking_app--bugfix-constants

2016-04-14 10:57:33 +02:00

..

.settings

downgraded org.json.simple to JavaSE-1.7 so Android projects can use it

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

assets

Changed the folders for assets and filtered assets

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

res

Merge remote-tracking branch 'server/master'

2016-02-22 17:15:56 +01:00

src/com/sap/sailing/android/buoy/positioning/app

Use GpsFix in MarkPingInfo

2016-04-12 17:00:11 +02:00

tests-jvm/src/com/sap/sailing/android/buoy/positioning/app/valueobjects

Deserialize marks with MarkJsonDeserializer

2016-04-12 16:38:29 +02:00

.classpath

Correct class path entry for licenses dialog library

2015-12-10 10:29:06 +01:00

.gitignore

Changed the folders for assets and filtered assets

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

.project

…

AndroidManifest.xml

upgraded AndroidManifest.xml versions of apps

2016-04-13 14:59:33 +02:00

build.gradle

SAP Maps API Key for Buoy Pinger App

2016-04-04 08:59:19 +02:00

pom.xml

Merged master into ubilabs--tracking_app--develop

2016-01-29 10:24:41 +01:00

proguard-project.txt

…

project.properties

Merged master into ubilabs--tracking_app--develop

2016-01-29 10:24:41 +01:00