Files
sailing-analytics/java
Papick Garcia Taboada 3cdc04cddd Merge branch 'design2015' of ssh://trac@sapsailing.com/home/trac/git
into design2015

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventActivity.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventView.java
2015-02-09 15:57:28 +01:00
..