Armin Zamani 1d54ffb57f Merge branch 'racecommittee_app' into racecommittee_kw13 ...

Conflicts:
	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

2013-06-22 10:25:40 +02:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

jsp

moved up hasScoreCorrection for an entire leaderboard column / RaceColumn from SettableScoreCorrection to ScoreCorrection

2013-04-09 15:22:43 +02:00

META-INF

Merge branch 'master' into racecommittee_integrated

2013-02-18 16:53:55 +01:00

src/com/sap/sailing/server/gateway

Merge branch 'racecommittee_app' into racecommittee_kw13

2013-06-22 10:25:40 +02:00

utils

Merge branch 'racecommittee_integrated' of

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

WEB-INF

Merge branch 'master' into racecommittee_app

2013-06-05 01:18:57 +02:00

webservices

added a maxCompetitorsCount parameter to the leaderboard json export to limit the number of exported competitors

2013-06-17 17:35:41 +02:00

.classpath

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02: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

Resolved a warning in the system regarding the gateway bundle

2013-04-08 05:26:42 +02:00

main.css

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