Axel Uhl c82e93a511 Merge branch 'ubilabs--tracking_app--develop' into ubilabs-tracking_app--bugfix--bug_2679 ...

Conflicts:
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java

2015-03-05 13:46:59 +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

…

com.sap.sailing.android.shared

fixed formatting of MessageSendingService

2015-03-04 18:06:38 +01:00

com.sap.sailing.android.tracking.app

Merge branch 'ubilabs--tracking_app--develop' into ubilabs-tracking_app--bugfix--bug_2679

2015-03-05 13:46:59 +01:00

com.sap.sailing.racecommittee.app

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

2015-03-04 16:46:28 +01:00

com.sap.sailing.racecommittee.app.test

…

google-android-support-v7-appcompat_lib

fixed classpaths for support libraries

2014-12-15 10:53:39 +01:00

google-android-support-v7-recyclerview_lib

added RecyclerView support library to Race Committee App

2014-11-20 09:19:32 +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

Merge branch 'master' into android_apps

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

proguard-mobile.txt

Merge branch 'bug2572' into android_apps

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