Axel Uhl ae90148d71 Merge branch 'master' into bug1407-new ...

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/target/start

2013-06-10 11:23:47 +02:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

added measure for distance to starboard end of start line at start

2013-04-26 20:43:30 +02:00

resources

expanded test data for leaderboard compression test by an expanded R9; added test case for leg detail compression

2013-06-03 21:17:26 +02:00

src/com/sap/sailing/domain

Merge branch 'master' into bug1407-new

2013-06-10 11:23:47 +02:00

.classpath

Merge branch 'racecommittee_integrated' of

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

.gitignore

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

FetchAndStoreHamburgTracks (proxy).launch

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

runUnicodeTest

Merge branch 'racecommittee_integrated' of

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

SailingDomainTest (No Proxy, Remote Profiling).launch

Merge branch 'racecommittee_integrated' of

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

SailingDomainTest (No Proxy, Tunnel).launch

Merge branch 'racecommittee_integrated' of

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

SailingDomainTest (No Proxy).launch

Merge branch 'racecommittee_integrated' of

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

SailingDomainTest (Proxy, No Tunnel).launch

Merge branch 'racecommittee_integrated' of

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

SailingDomainTest (Proxy, Remote Profiling).launch

Merge branch 'racecommittee_integrated' of

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

SailingDomainTest (Proxy).launch

Merge branch 'racecommittee_integrated' of

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

TestTTCM tunneled through localhost.launch

Merge branch 'racecommittee_integrated' of

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

TestTTCM without Proxy.launch

Merge branch 'racecommittee_integrated' of

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