eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 21:25:38 +00:00
Code Activity

Merge remote-tracking branch 'origin/master' into bug2822_boatcolors

Browse Source 
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
This commit is contained in:
fmittag
2016-12-29 14:03:06 +01:00
parent f9079f8098 9ec3d39b19
commit 474295d281
907 changed files with 82343 additions and 5006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF
+2 -1
View File
@@ -9,7 +9,8 @@ Export-Package: .,
com.sap.sailing.xrr.structureimport.buildstructure;uses:="com.sap.sailing.xrr.resultimport.schema",
com.sapsailing.xrr.structureimport.eventimport
Bundle-ActivationPolicy: lazy
Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0",
Require-Bundle: com.google.gwt.user;bundle-version="2.8.0";resolution:=optional,
com.google.gwt.servlet;bundle-version="2.8.0",
com.sap.sailing.domain.common;bundle-version="1.0.0",
com.sap.sailing.domain,
com.sap.sailing.xrr.schema;bundle-version="1.0.0",