Axel Uhl 1cae206254 Merge branch 'ubilabs--tracking_app--develop' ...

Conflicts:
	mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java

2015-08-12 15:32:49 +02: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

Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login

2015-08-12 09:22:30 +02:00

com.sap.sailing.android.tracking.app

Merge branch 'ubilabs--tracking_app--develop'

2015-08-12 15:32:49 +02:00

com.sap.sailing.buoy.positioning

Merge branch 'ubilabs--tracking_app--develop'

2015-08-12 15:32:49 +02:00

com.sap.sailing.racecommittee.app

Merge branch 'ubilabs--rcapp--master'

2015-08-12 15:32:05 +02:00

github-advrecyclerview_lib

suppress all warnings that occurred in com.h6ah4i.android.widget.advrecyclerview which is an external project we don't maintain locally

2015-06-09 00:12:22 +02:00

google-android-support-v7-appcompat_lib

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

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

google-android-support-v7-recyclerview_lib

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

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

google-play-services_lib

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

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

.gitignore

…

build.gradle

Merge branch 'bug2572' into android_apps

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

git.gradle

changed to get HEAD if compiled from a detached head

2015-06-24 16:01:53 +02:00

pom.xml

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

2015-05-06 11:32:59 +02:00

proguard-mobile.txt

deactivated ProGuard

2015-05-26 17:34:19 +02:00