Axel Uhl c553802954 Merge branch 'master' into persistentCompetitors ...

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java

2013-11-07 12:58:35 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

Merge branch 'master' into import_dbdata

2013-06-29 10:46:20 +02:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into persistentCompetitors

2013-11-07 12:58:35 +01:00

.classpath

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