Axel Uhl b9ef73b9ad Merge branch 'master' into bug3237 ...

Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java

2015-08-18 16:49:27 +02:00

..

android-keystore

…

backup-json

…

com.sap.sailing.android.shared

Accept head requests

2015-08-17 11:06:30 +02:00

com.sap.sailing.android.tracking.app

removed commented code

2015-08-13 17:34:47 +02:00

com.sap.sailing.buoy.positioning

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

2015-08-13 10:40:15 +02:00

com.sap.sailing.racecommittee.app

on the way to a fix for bug 3237, introduced isMagnetic on RaceLogWindFixEvent; code currently doesn't compile; unclear where to obtain DeclinationService from

2015-08-18 15:19:54 +02:00

github-advrecyclerview_lib

…

google-android-support-v7-appcompat_lib

…

google-android-support-v7-recyclerview_lib

…

google-play-services_lib

…

.gitignore

…

build.gradle

…

git.gradle

changed to get HEAD if compiled from a detached head

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

pom.xml

…

proguard-mobile.txt

…