sailing-analytics

eclipse-sailing-analytics/sailing-analytics

0 Fork 0

mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00

Files

T

Benjamin Ebling d46376eb40 Merge branch 'master' into usermanagement

Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch

2014-06-04 15:49:02 +02:00

features

Merge branch 'master' into usermanagement

2014-06-04 15:49:02 +02:00

plugins

Merge branch 'master' into usermanagement

2014-06-04 15:49:02 +02:00

.gitignore

remove gen/p2 folder

2011-12-29 13:30:41 +01:00

.project

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

README

added link to target platform update description into README

2013-12-09 10:39:19 +01:00

site.xml

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

README

See http://wiki.sapsailing.com/wiki/typical-development-scenarios#Adding-a-Bundle-to-the-Target-Platform