eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-22 20:13:52 +00:00
Code Activity

Merge branch 'master' into gpsfixstore-independent-of-race

Browse Source 
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
This commit is contained in:
Fredrik Teschke committed 2014-02-12 21:58:31 +01:00
2 parents 0e07b781c6 8401e2e86f
commit 07f5efe154
235 files changed
+4869 -5178
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/META-INF/MANIFEST.MF
-2
View File
@@ -7,8 +7,6 @@ Bundle-Activator: com.sap.sailing.server.impl.Activator
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.sap.sailing.server.gateway.deserialization,
com.sap.sailing.server.gateway.deserialization.masterdata.impl,
com.sap.sailing.server.gateway.serialization.masterdata.impl,
org.json.simple,
org.json.simple.parser,
org.osgi.framework;version="1.3.0",