Bennet Brunsen f9715d2790 Merge branch 'ubilabs--buoy_positioning_app--bugfix--ui_improvements' into ubilabs--buoy_positioning_app--develop ...

Conflicts:

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy
/positioning/app/ui/activities/RegattaActivity.java

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

..

android-keystore

Gradle: all Android debug build will be signed with the STG-debug key

2015-01-19 19:41:40 +01:00

backup-json

added backup of json's

2013-06-27 21:39:48 +02:00

com.sap.sailing.android.shared

Merge branch 'ubilabs--buoy_positioning_app--bugfix--ui_improvements' into ubilabs--buoy_positioning_app--develop

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

com.sap.sailing.android.tracking.app

Implements refresh function for marks on new checkin and inside RegattaActivity

2015-03-27 15:27:19 +01:00

com.sap.sailing.buoy.positioning

Merge branch 'ubilabs--buoy_positioning_app--bugfix--ui_improvements' into ubilabs--buoy_positioning_app--develop

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

com.sap.sailing.racecommittee.app

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

2015-03-24 20:37:36 +01:00

com.sap.sailing.racecommittee.app.test

added JSON (de)serializers for GPS fixes, IMEIs and compound documents

2014-02-02 10:22:11 +01:00

google-android-support-v7-appcompat_lib

Update to targetApi 22

2015-03-17 12:31:58 +01:00

google-android-support-v7-recyclerview_lib

Update to targetApi 22

2015-03-17 12:31:58 +01:00

google-play-services_lib

Merge branch 'master' into android_apps

2015-01-23 10:08:08 +01:00

.gitignore

TRACKING APP: Ignore binary folder in test-app

2014-12-10 10:11:07 +01:00

build.gradle

Merge branch 'bug2572' into android_apps

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

pom.xml

Implemented StartActivity and partially HomeFragment

2015-03-19 15:56:31 +01:00

proguard-mobile.txt

Merge branch 'bug2572' into android_apps

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