eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 18:20:14 +00:00
Code Activity

Merge branch 'master' into bug2610_lifecycle

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java
This commit is contained in:
Axel Uhl committed 2016-03-28 18:24:03 +02:00
2 parents 92fad265ec 6f1fca66f4
commit 525f90db9d
153 files changed
+4939 -1414
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sse.gwt/META-INF/MANIFEST.MF
+3 -3
View File
@@ -9,9 +9,9 @@ Require-Bundle: com.google.gwt.osgi;bundle-version="2.7.0",
com.sap.sse.common,
com.sap.sse.filestorage
Bundle-ActivationPolicy: lazy
Import-Package: com.google.gwt.core.ext,
com.google.gwt.core.ext.linker,
com.google.gwt.core.ext.linker.impl,
Import-Package: com.google.gwt.core.ext;resolution:=optional,
com.google.gwt.core.ext.linker;resolution:=optional,
com.google.gwt.core.ext.linker.impl;resolution:=optional,
javax.servlet;version="2.6.0",
javax.servlet.descriptor;version="2.6.0",
javax.servlet.http;version="2.6.0",