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

Conflicts:
	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-09 20:36:22 +01:00

..

.settings

Merge branch 'master' into racecommittee_integrated

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

META-INF

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

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

src/com/sap/sailing

Merge branch 'master' into racecommittee_integrated

2012-12-09 20:36:22 +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

…

build.properties

…

pom.xml

clean up of all version in all pom.xml files

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