Armin Zamani 66424926c4 Merge branch 'master' into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.freg.resultimport.test/bin/freg_html_export_sample.html
	java/com.sap.sailing.gwt.ui/pom.xml
	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/server/SailingServiceImpl.java

2013-01-30 16:36:08 +01:00

..

.settings

Merge branch 'master' into racecommittee_integrated

2013-01-10 18:28:46 +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

2013-01-30 16:36:08 +01:00

.classpath

Merge branch 'master' into racecommittee_integrated

2013-01-10 18:28:46 +01:00

.gitignore

moved all Java stuff to java/ subdir

2011-06-10 16:39:27 +02:00

.project

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

build.properties

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

pom.xml

clean up of all version in all pom.xml files

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