Axel Uhl 09013efb0c Merge branch 'master' into bug2977 ...

Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/BaseRacingProcedure.java

2015-06-22 22:47:48 +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

added backup of json's

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

com.sap.sailing.android.shared

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

2015-06-17 09:19:24 +02:00

com.sap.sailing.android.tracking.app

don't check for string "ok", better check for HttpURLConnection.HTTP_OK (int value)

2015-06-11 14:49:04 +02:00

com.sap.sailing.buoy.positioning

Fixes eclipse warnings in tracking app project and theme related run time exceptions

2015-06-11 12:13:48 +02:00

com.sap.sailing.racecommittee.app

Merge branch 'master' into bug2977

2015-06-22 22:47:48 +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

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

git.gradle

Gradle: create build info in assets folder while build - no compile error within Eclipse - with helper function in AppUtils

2015-03-31 15:55:38 +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