Files
sailing-analytics/java/com.sap.sailing.simulator/resources
Christopher Ronnewinkel (D036654) e672d2ec6e Merge remote-tracking branch 'origin/master' into simulator_dev
Conflicts:
	java/com.sap.sailing.simulator.test/resources/windField.dat
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TestTimeComparison.java
	java/com.sap.sailing.simulator/resources/windField.dat
	java/com.sap.sailing.simulator/src/resources/PolarDiagram49STG.csv
	java/com.sap.sailing.simulator/src/resources/windField.dat
2013-05-21 16:20:39 +02:00
..