Lukas Niemeier 953eaaa668 Merge branch 'racecommittee_app' into racecommittee_app_startphases ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java

2013-11-20 12:25:57 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

- Made recordWind return a flag wether a wind fix has been considered for a tracked race

2013-09-13 09:41:23 +02:00

src/com/sap/sailing/server/gateway

Merge branch 'racecommittee_app' into racecommittee_app_startphases

2013-11-20 12:25:57 +01:00

utils

Merge branch 'racecommittee_integrated' of

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

WEB-INF

Merge branch 'master' into racecommittee_app

2013-10-30 14:38:14 +01:00

webservices

added missing optional parameters description for some of the new Webservices implemented with JAX-RS

2013-09-16 16:06:35 +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

refactoring of Webservice API to use JAX-RS as implementation technique

2013-08-30 15:50:46 +02:00

pom.xml

Merge branch 'racecommittee_integrated' of

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