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

Merge remote-tracking branch 'origin/gwt' into spectator

Browse Source 
Conflicts:
	java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BearingCluster.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
This commit is contained in:
Lennart Hensler committed 2012-01-16 11:42:56 +01:00
2 parents 82cd18b135 0e35cb90b9
commit 4a71aa0c74
85 files changed
+3018 -1623
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.sap.sailing.declination,
com.sap.sailing.domain
com.sap.sailing.domain,
com.sap.sailing.domain.common
Import-Package: com.sap.sailing.domain.common,
com.sap.sailing.domain.common.impl,
com.sap.sailing.domain.common.quadtree,