Files
sailing-analytics/java/com.sap.sailing.server/META-INF
Fredrik Teschke 07f5efe154 Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
2014-02-12 21:58:31 +01:00
..