Armin Zamani c823fa9bd2 Merge branch 'master' into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

2012-12-25 22:24:16 +01:00

..

.settings

Merge branch 'master' into racecommittee_integrated

2012-12-04 23:56:27 +01:00

META-INF

added the racecommittee impl folder in sailing/domain to the list of

2012-12-25 18:12:51 +01:00

src/com/sap/sailing

Merge branch 'master' into racecommittee_integrated

2012-12-25 22:24:16 +01:00

.classpath

# changed domain to java 1.6 - only change needed was infer generic type arguments...

2012-10-10 14:27:24 +02:00

.gitignore

…

.project

remove m2e nature from all .project files

2011-11-09 22:06:14 +01:00

build.properties

…

pom.xml

clean up of all version in all pom.xml files

2012-01-04 16:04:23 +01:00