Merge branch 'master' into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.freg.resultimport.test/bin/freg_html_export_sample.html
	java/com.sap.sailing.gwt.ui/pom.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
This commit is contained in:
Armin Zamani committed 2013-01-30 16:36:08 +01:00
commit 66424926c4
109 files changed
+12432 -6928

No files matched your search

+1 -1
View File
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.moxieapps.gwt</groupId>
<artifactId>org.moxieapps.gwt.highcharts</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>