Lennart Hensler
6cf5a9e618
Added a detail type for the overall rank.
...
The competitor charts can now display the overall rank.
2013-02-04 10:57:37 +01:00
Lukas Niemeier
ad6b6fa37c
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/RaceCommitteeEventFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/impl/RaceCommitteeEventFactoryImpl.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogEventTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogFlagEventSerializerTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogStartTimeEventSerializerTest.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeFlagEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeStartTimeEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BaseRaceLogEventSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeEventSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeStartTimeEventSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogFlagEventSerializer.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventTrackJsonExportServlet.java
2013-02-03 00:13:16 +01:00
Armin Zamani
02b225f307
Renamed RaceCommittee to RaceLog
2013-02-02 16:34:53 +01:00
Lukas Niemeier
e45040db9b
# added CourseAreaChangedEvent and serializers
2013-02-02 15:01:03 +01:00
Lukas Niemeier
7824b6fa91
# removed association between CourseArea and RaceDefinition (will be handled via CourseAreaChangedEvent)
2013-02-02 14:46:31 +01:00
Armin Zamani
12bf61007a
CourseArea now implements WithID
2013-02-02 00:24:43 +01:00
Axel Uhl
d6d67439c4
fixing bug 1189 by adjusting the regexp for marks of a gate; fixing ID serialization for ControlPoints to/from GWT
2013-02-01 23:27:25 +01:00
Axel Uhl
0f1bd77329
Merge remote-tracking branch 'origin/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-01 18:21:21 +01:00
Axel Uhl
27a98ece02
fix for bug 1184, also making ControlPoint a WithID extension
2013-02-01 18:18:25 +01:00
Axel Uhl
171744a2c4
working towards solving bug 1184; introduced separate ID field in MarkImpl in addition to name
2013-02-01 18:01:02 +01:00
Lennart Hensler
77b6580634
Added attributes for the leaderboardName and the leaderboardGroupName to
...
the competitor charts.
Added new detail type REGATTA_RANK, to display the changes of the total
rank during a race.
2013-02-01 15:33:03 +01:00
Frederik Petersen
c2a2d5aded
Added histogram for polarsheet angles
2013-01-31 16:37:26 +01:00
Frederik Petersen
42127c83fb
Changed multithreading approach of polar sheets generation to use executor
2013-01-31 09:03:41 +01:00
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
Frederik Petersen
8ee3d50d1b
Added debugging labels to polarsheetspanel
2013-01-30 14:44:40 +01:00
Frederik Petersen
8d118b0bcc
Merge branch 'master' into polarsheets
...
Conflicts:
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.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
2013-01-30 08:36:45 +01:00
Frederik Petersen
298744e141
Fixes for Polarsheet generation
...
concerning multi-threading
angles
Still problem with locks
2013-01-29 17:07:10 +01:00
Axel Uhl
01ea076fd3
progress indication also for SwissTiming replay adapter
2013-01-29 14:51:56 +01:00
Lennart Hensler
17f88acdaa
Added an assert, that the name of a race definition mustn't be null.
2013-01-29 13:17:39 +01:00
Frederik Petersen
58bd249568
Merge branch 'master' into polarsheets
2013-01-29 13:00:22 +01:00
Frederik Petersen
f50c5f964f
Added connection between polarsheets front- and backend
2013-01-29 12:59:23 +01:00
fmittag
0a0fe8147a
Merge remote-tracking branch 'origin/master' into buoyzone_drawing
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapSettingsDialogComponent.java
2013-01-29 10:38:51 +01:00
Axel Uhl
3e950c86b8
let SmartFutureCache suspend/resume so it doesn't produce unlimited numbers of tasks in queue; see also bug 1175
2013-01-28 17:54:21 +01:00
Armin Zamani
e0ac319d4d
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
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.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java
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/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRegattaImpl.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/TrackedLegImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/LockUtil.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-01-28 15:28:42 +01:00
Frederik Petersen
913e0381e9
Merge branch 'master' into polarsheets
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-01-28 08:28:44 +01:00
Axel Uhl
2c680f8984
also apply latest tracking status to new races added to the TracTracRaceTrackerImpl
2013-01-27 00:38:41 +01:00
Axel Uhl
25354ae735
extracted TrackedRaceStatusEnum and added a column showing the status in TrackedRacesListComposite
2013-01-26 20:13:22 +01:00
Axel Uhl
548c80836e
added waitUntilNotLoading to TrackedRace and use it in the expensive caches to avoid recomputatoins during loading phase
2013-01-26 18:00:42 +01:00
Axel Uhl
4a580983d5
introduced TrackedRaceStatus as first step towards addressing bug 1175; replication of status updates already supported
2013-01-26 14:58:33 +01:00
Axel Uhl
b2e3db25a8
improved thread pool management: use ThreadPoolExecutor such that it terminates threads if they aren't used in a while
2013-01-26 01:11:24 +01:00
Armin Zamani
29a669e296
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
2013-01-25 22:06:14 +01:00
Frederik Petersen
71ab90a6a8
Merge branch 'master' into polarsheets
2013-01-25 11:25:04 +01:00
Frederik Petersen
4a9b3aa0bf
Added serverside polar sheet generation workers.
...
data needs to be queried from the polarsheetgenerationworker
2013-01-25 11:23:34 +01:00
Frederik Petersen
519d442deb
Added comment for waitForLatest parameter
...
method: getManeuvers
class: TrackedRace
2013-01-25 10:54:14 +01:00
Lennart Hensler
311576db6e
Replaced the catches of Throwable with catches of Exception
2013-01-25 10:28:07 +01:00
Frederik Petersen
d7847aba19
Added method in sailing service for polar sheet generation
...
also added some functionality to the polarsheetchartpanel
2013-01-24 15:53:01 +01:00
Armin Zamani
33ce26f635
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
2013-01-23 13:55:48 +01:00
Axel Uhl
128d554698
added a variant of the HighPoint scoring system that awards the winner 10 points; needed for the 2013 ESS
2013-01-22 10:16:24 +01:00
Armin Zamani
67fa3c01dc
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
2013-01-21 21:36:36 +01:00
Axel Uhl
c1c2885b02
avoid empty virtual wind tracks for SwissTiming races as they don't have a startOfTracking/endOfTracking marker
2013-01-18 17:39:37 +01:00
Armin Zamani
1e97dc8bc3
Fix for replication bug, which was a concurrency issue: The bug occurred
...
sometimes when the loading of the RC track was not finished in the
TrackedRace constructor and getOrCreateRaceCommitteeTrack was called
meanwhile. Since the global variable raceCommitteetrack was null at that
time the getOrCreateRaceCommitteeTrack method created a new
RacecommitteeTrack and the inserted data got lost when the loading in
the constructor thread finished
2013-01-17 22:45:44 +01:00
Armin Zamani
d0b70ab18d
Added some debug printings to find the old replication bug
2013-01-16 19:49:38 +01:00
Lukas Niemeier
f74af14730
# deserialization for event, coursearea, venue
2013-01-16 18:04:52 +01:00
Armin Zamani
64d422358a
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/RaceColumnListeners.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java
2013-01-16 15:29:44 +01:00
Axel Uhl
8bb24c8f74
fixing bug 1149: changing the result discarding rules invalidates the leaderboard DTO cache
2013-01-15 17:31:27 +01:00
Armin Zamani
c78074b801
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
2013-01-15 16:36:48 +01:00
Axel Uhl
ad0e9bc69f
print exception stack traces before calling tearDown in case a setUp routine for a replication test fails for an exception
2013-01-14 14:09:03 +01:00
Axel Uhl
d6b41f05a6
apply a waiting sleep in the NMEA SentenceReader only if the underlying stream is not ready()
2013-01-14 13:11:37 +01:00
Armin Zamani
7deda8b123
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/CollectionNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
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.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/.classpath
java/com.sap.sailing.domain/.settings/org.eclipse.jdt.core.prefs
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/CourseArea.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Series.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseAreaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/AbstractMetaLeaderboard.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java
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/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.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/TrackedLegImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/LockUtil.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/RaceColumnListeners.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/build.properties
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/server/LeaderboardDTOCache.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateTrackedRace.java
2013-01-10 18:28:46 +01:00
Axel Uhl
025f9886e8
Merge branch 'integration_tests'
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/util/CourseAsWaypointList.java
2013-01-10 07:22:26 +01:00
Lennart Hensler
Lukas Niemeier
Armin Zamani
Axel Uhl
Frederik Petersen
fmittag