Files
sailing-analytics/java
Axel Uhl 7747e8707d Merge branch 'ubilabs--tracking_app--develop' into ubilabs--buoy_positioning_app--develop
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-04-22 14:56:03 +02:00
..