Files
sailing-analytics/java
Axel Uhl dceee2da70 Merge branch 'master' into bug3378
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/Hoverline.java

Change-Id: I294dc7dc78fcab5ad4bd3ad4581fb47f530cd238
2015-12-15 17:30:09 +01:00
..