eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-28 14:57:12 +00:00
Code Activity

Solved merge conflicts in TrackedRaceImpl

Browse Source
This commit is contained in:
Alexander Ries committed 2014-11-27 11:22:33 +01:00
2 parents 0a98c9febe 45e64333de
commit e0f5c546ed
1388 files changed
+13610 -8316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+15 -13
View File
@@ -19,27 +19,29 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.resultimport,
org.moxieapps.gwt.highcharts;bundle-version="1.5.0",
com.sap.sailing.geocoding,
com.sap.sailing.server.replication,
com.sap.sse.replication,
com.googlecode.java-diff-utils;bundle-version="1.3.0",
com.sap.sailing.freg.resultimport,
com.sap.sailing.domain.swisstimingreplayadapter,
com.sap.sailing.simulator;bundle-version="1.0.0",
com.sap.sailing.simulator,
com.google.gwt.osgi;bundle-version="2.6.0",
com.sap.sailing.domain.igtimiadapter,
com.sap.sailing.xrr.resultimport,
com.sap.sailing.datamining.shared;bundle-version="1.0.0",
com.sap.sailing.datamining;bundle-version="1.0.0",
com.sap.sse.gwt;bundle-version="1.0.0",
com.sap.sailing.domain.racelogtrackingadapter;bundle-version="1.0.0",
com.sap.sailing.manage2sail;bundle-version="1.0.0",
com.sap.sse.common;bundle-version="1.0.0",
com.sap.sse.datamining.shared;bundle-version="1.0.0",
com.sap.sse.datamining;bundle-version="1.0.0",
com.sap.sse.security;bundle-version="1.0.0",
com.sap.sse.security.ui;bundle-version="1.0.0",
com.sap.sailing.datamining.shared,
com.sap.sailing.datamining,
com.sap.sse.gwt,
com.sap.sailing.domain.racelogtrackingadapter,
com.sap.sailing.manage2sail,
com.sap.sse.common,
com.sap.sse.datamining.shared,
com.sap.sse.datamining,
com.sap.sse.security,
com.sap.sse.security.ui,
org.apache.shiro.web;bundle-version="1.2.2",
org.apache.shiro.ehcache;bundle-version="1.2.3",
com.sap.sse.gwt.adminconsole;bundle-version="1.0.0"
com.sap.sse.gwt.adminconsole,
com.sap.sse.operationaltransformation,
com.sap.sse
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
Bundle-ActivationPolicy: lazy
Import-Package: javax.jms;version="1.1.0",