Files
sailing-analytics/java
D049941 6df282edf7 Merge branch 'master' into riccardo2
Conflicts:
	configuration/udpsender.py
	configuration/udpserver.py
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/DatabaseHelper.java
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on
8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java
2013-12-05 12:30:46 +01:00
..