Lukas Niemeier 79379e416a Merge branch 'racecommittee_regattaoverview' into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/racelog/impl/PassAwareRaceLogImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/RaceStatusAnalyzer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java

2013-03-04 16:59:42 +01:00

..

.settings

# Added a (for now empty) shared domain bundle

2013-02-09 19:02:46 +01:00

META-INF

added some rudimentary table to the gwt regattaoverview.

2013-03-04 00:56:18 +01:00

src/com/sap/sailing

Merge branch 'racecommittee_regattaoverview' into racecommittee_integrated

2013-03-04 16:59:42 +01:00

.classpath

# Added a (for now empty) shared domain bundle

2013-02-09 19:02:46 +01:00

.project

# Added a (for now empty) shared domain bundle

2013-02-09 19:02:46 +01:00

build.properties

# Added a (for now empty) shared domain bundle

2013-02-09 19:02:46 +01:00

pom.xml

# fixed pom

2013-02-18 14:44:27 +01:00