Files
sailing-analytics/java/com.sap.sailing.server/META-INF
Frederik Petersen ca2ac594f5 Merge branch 'master' into bug2700
Conflicts:
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java
2015-04-24 18:41:37 +02:00
..
2015-04-24 18:41:37 +02:00