Axel Uhl f0bd78abd6 Merge branch 'master' into racecommittee_app ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java

2014-01-27 17:21:33 +01:00

..

.settings

further implementation on course designer.

2013-06-16 15:25:41 +02:00

META-INF

Changed carried points storing

2014-01-22 17:04:46 +01:00

src/com/sap/sailing

Merge branch 'master' into racecommittee_app

2014-01-27 17:21:33 +01:00

.classpath

# moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android

2013-02-18 13:26:32 +01:00

.gitignore

Merge branch 'racecommittee_integrated' of

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

.project

Merge branch 'racecommittee_integrated' of

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

build.properties

Merge branch 'racecommittee_integrated' of

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

pom.xml

Merge branch 'racecommittee_integrated' of

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