sailing-analytics

eclipse-sailing-analytics/sailing-analytics

mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 22:19:13 +00:00

T

Lukas Niemeier ad41f2e80c Merge branch 'master' into racecommittee_app

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java

2013-11-20 11:37:40 +01:00

configuration

Merge remote-tracking branch 'server/master' into persistentCompetitors

2013-11-07 10:53:30 +01:00

doc

added a very short summary presentation of the project

2013-11-12 10:31:46 +01:00

java

Merge branch 'master' into racecommittee_app

2013-11-20 11:37:40 +01:00

mobile

# check for existence of race before trying to add server events to racelog

2013-11-12 02:08:26 +01:00

wiki

Merge commit 'origin/master'

2013-11-15 11:26:05 +01:00

.gitignore

Preparing ignores for release directories

2013-11-06 21:53:59 +01:00

.project

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

home.md

Updated home (markdown)

2013-11-12 14:04:18 +01:00

pom.xml

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

racecommittee-app.md

Updated racecommittee app (markdown)

2013-08-09 00:09:12 +02:00

README

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

README_GWT

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

settings.xml

Merge remote-tracking branch 'origin/master' into simulator_dev

2013-03-21 11:48:40 +01:00

README

This branch will contain a sailing simulator