Axel Uhl b037a465a9 Merge branch 'master' into jbross-email-invitation ...

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch

2015-02-15 09:03:34 +01:00

..

android-keystore

Added STG keystore file for app publishing.

2015-01-16 15:47:15 +01:00

backup-json

added backup of json's

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

com.sap.sailing.android.shared

Fixed wrong encoding in MessageSendingService

2015-02-04 17:45:22 +08:00

com.sap.sailing.android.tracking.app

removing discrepancies to master (old 1.6 android compiler settings somehow appeared)

2015-01-23 20:09:53 +01:00

com.sap.sailing.racecommittee.app

Merge branch 'master' into jbross-email-invitation

2015-02-15 09:03:34 +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-play-services_lib

decentralize .gitignore entries for mobile projects and add .settings/*.prefs file

2014-10-16 22:47:22 +02:00

.gitignore

decentralize .gitignore entries for mobile projects and add .settings/*.prefs file

2014-10-16 22:47:22 +02:00

pom.xml

change maven compiler level for mobile projets to 1.7 (default was 1.5)

2015-01-11 20:07:40 +01:00