Frederik Petersen
ef58c54685
Merge branch 'master' into polar-api
2014-12-10 18:47:55 +01:00
Frederik Petersen
8094f87dd5
Confidence now shown in x-y-diagrams
2014-12-10 18:22:16 +01:00
Frederik Petersen
2b57a3636d
Fixed sizing issue of x-y-diagram dialog
2014-12-10 16:49:55 +01:00
Frederik Petersen
f03cacd7cf
Rechecked polar bundle in launch configs
...
these were overridden in previous merges
2014-12-10 13:01:16 +01:00
Frederik Petersen
5e0ff73751
Merge branch 'master' into polar-api
2014-12-10 12:55:36 +01:00
Frederik Petersen
734a29298b
Added x-y-diagram to polar sheets panel
...
for now only for upwind starboard speed
2014-12-03 10:39:31 +01:00
Frederik Petersen
e33258acf4
Added parameter to allow usage of mean instead of lin reg
2014-11-26 12:12:28 +01:00
Frederik Petersen
5dc74d1064
WindStepping now supports doubles as levels
2014-11-26 10:56:57 +01:00
Frederik Petersen
84221e52a3
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/test/PolarSheetGenerationTest.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/aggregation/PolarFixAggregationWorker.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/data/impl/PolarFixImpl.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/generation/PolarSheetGenerator.java
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-11-25 14:58:39 +01:00
Frederik Petersen
c65474dd37
Fixed PolarFixFilterCriteria for live races
2014-11-14 22:35:15 +01:00
Frederik Petersen
24221704ab
Merge branch 'master' into polar-api
2014-11-14 19:18:27 +01:00
Frederik Petersen
fa36c07460
Fixed possible null pointers when GPS fix not valid for polar diagram
2014-11-13 18:32:07 +01:00
Frederik Petersen
e5f0bb7f7c
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2014-11-12 17:58:43 +01:00
Frederik Petersen
d09675bc9a
Fixed test to comply with performance fixes
2014-11-12 17:19:41 +01:00
Frederik Petersen
723302df82
Further performace fixes for average polar service methods
2014-11-12 17:00:51 +01:00
Frederik Petersen
b1d0ee5519
Optimized polar data service average methods
2014-11-12 16:08:18 +01:00
Frederik Petersen
58811787a2
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-11-07 19:16:13 +01:00
Frederik Petersen
2412fd4943
Removed redundant methods in polar data service
2014-11-07 19:04:13 +01:00
Frederik Petersen
86b597a76b
Added comments and a central method for average speed with bearing
2014-11-07 18:24:27 +01:00
Frederik Petersen
7bf811ce74
Added confidence to backend polar data aggregation
...
confidence is aggregated by using the confidences of the windspeed,
and boatspeed sources (50%) and a confidence calculated using the amount
of underlying fixes (50%)
2014-11-07 17:52:48 +01:00
Frederik Petersen
c3f8b77870
Added rest service for average polar api debugging
...
also:
-we now use polar data service as a facade to the polar sheets analyzer
-Peak is now double instead of int
2014-11-06 22:56:14 +01:00
Frederik Petersen
07ac462db6
Added realdata test case for polar sheet analyzer
...
also fixed a little problem with the calculation of peak candidates
2014-11-06 21:47:45 +01:00
Frederik Petersen
861359071f
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2014-11-05 17:52:10 +01:00
Frederik Petersen
4d42f06a54
Changed to polarSheetAnalyzer to behave as discussed with christopher
2014-11-05 16:21:05 +01:00
Frederik Petersen
0066b170c2
Fixed test and dataming update problems
2014-11-05 13:01:03 +01:00
Frederik Petersen
db968e5937
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2014-11-05 12:06:54 +01:00
Frederik Petersen
0b9ec80734
Merge branch 'polar-api' of ssh://sapsailing.com/home/trac/git into polar-api
2014-10-29 12:10:56 +01:00
Frederik Petersen
2307f8a3a9
Added new histogram to polar sheets panel showing datacount over angle
2014-10-29 10:19:30 +01:00
Frederik Petersen
0b9843cb56
Only estimated wind is used for bearing in backend polars
2014-10-26 10:12:26 +01:00
Frederik Petersen
4763026d86
First end-to-end functionality between polar api and ui now works
...
a lot of data still stubbed
2014-10-22 13:05:27 +02:00
Frederik Petersen
afe364a78d
Fixed server launch configs
2014-10-22 11:55:53 +02:00
Frederik Petersen
4564a44eed
Started adapting polar data mining to supply sheets to existing UI
2014-10-22 11:33:00 +02:00
Frederik Petersen
fc75b17ace
Merge branch 'master' into polar-api
2014-10-22 10:16:37 +02:00
Frederik Petersen
4cad148934
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
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
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalGroupingProcessor.java
2014-10-16 09:33:58 +02:00
Frederik Petersen
9518993c37
Merge branch 'importer-wind-fix'
2014-08-07 15:44:01 +02:00
Frederik Petersen
d27f0affab
Fixed issue where wind was not correctly imported during...
...
... master data import
2014-08-07 15:42:46 +02:00
Frederik Petersen
d1b12cd269
Added failing test case for wrong usage of race id when storing wind
...
tracks per dummy tracked race
2014-08-07 15:40:07 +02:00
Frederik Petersen
2d09ef7ef1
Fixed temporary fix for NPE in polar sheets generation
2014-07-29 13:51:34 +02:00
Frederik Petersen
a9c360fd37
Updated jquery version for PolarSheets module
2014-07-29 13:37:46 +02:00
Frederik Petersen
7246e1b950
Fixed loading of reace columns for flexible leaderboard
...
now only default fleet is allowed for flexible leaderboard
2014-07-21 12:49:13 +02:00
Frederik Petersen
380d01cc04
Removed unused groovy-eclipse dependency
2014-07-21 10:50:21 +02:00
Frederik Petersen
0c99d345c9
Merge branch 'master' of ssh://sapsailing.com/home/trac/git
2014-07-21 10:09:14 +02:00
Frederik Petersen
2b526f07b1
FlexibleLeaderboards now do not allow multiple fleets for race creation
...
The default fleet is a singleton and the interface of the
FlexibleLeaderboard was cleaned up. Before the cleanup, the user was
allowed to add mutiple fleets when creating a race or a race column. This
is not allowed in the persistence model
2014-07-21 10:06:47 +02:00
Frederik Petersen
5c62ab4364
Changed groovy-eclipse version in all target platforms
...
older version is not available anymore
2014-07-21 10:06:04 +02:00
Frederik Petersen
a704b493c9
Replaced groovy eclipse release version to fix target platform
2014-07-18 17:15:00 +02:00
Frederik Petersen
60f3c4811d
ImportMasterDataOperation now initializes RaceLogInformation in readObject
...
fixes bug2023
2014-07-11 13:34:58 +02:00
Frederik Petersen
6690b04464
Moderator Shortkey now hides timepanel controls
...
play/pause button is moved up to the left of the timeslider when controls
are hidden
2014-06-26 16:19:17 +02:00
Frederik Petersen
58c26e0635
Added caching of LegTypes for getBoatPositions
...
The caching happens locally in the method with a resolution of one minute.
This should increase the performance of the method.
2014-06-25 19:24:42 +02:00
Frederik Petersen
988c22d911
Global navigation controls can now be hidden in race board panel
2014-06-24 11:28:12 +02:00
Frederik Petersen
0329bf13ad
Test for course update LeaderboardDTO caching bug 2011
2014-06-23 09:17:32 +02:00
Frederik Petersen
0a30489cf7
Merge branch 'master' of ssh://sapsailing.com/home/trac/git
2014-06-22 13:48:13 +02:00
Frederik Petersen
e2e7a3ed31
Added moderator shortkey CTRL+M / CTRL+m for hiding navigation panel
...
applies to RaceboardPanel
2014-06-22 11:53:46 +02:00
Frederik Petersen
416c3cf4b9
Merge branch 'bug2010'
2014-06-22 09:59:09 +02:00
Frederik Petersen
60e7b713d0
Regattas races collection is now empty when imported
...
fixes bug2010
2014-06-22 09:58:07 +02:00
Frederik Petersen
ed1d643a76
Added hamcrest to manifest because of mockito
2014-06-21 20:51:37 +02:00
Frederik Petersen
d6439b61c7
Merge branch 'kiwo2014' of ssh://sapsailing.com/home/trac/git into kiwo2014
2014-06-21 19:40:12 +02:00
Frederik Petersen
582814b31b
Merge branch 'master' into kiwo2014
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardViewConfiguration.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVEntryPoint.java
2014-06-21 19:38:04 +02:00
Frederik Petersen
fa09759b73
Merge branch 'bug-2008'
2014-06-21 17:51:35 +02:00
Frederik Petersen
f9d9183442
viewShowNavigationPanel now enabled in RaceBoard and Spectator panels
...
fixes bug2008
2014-06-21 17:50:15 +02:00
Frederik Petersen
5a0af4f0d9
Added server trackers for the result url activation szenario
2014-06-21 16:34:19 +02:00
Frederik Petersen
c9dddc3158
Merge branch 'master' into result-url-persistence
2014-06-21 10:43:10 +02:00
Frederik Petersen
631f6685a7
Added test for result url persistence
2014-06-21 10:42:31 +02:00
Frederik Petersen
492736098c
Added persistence for result import urls
2014-06-21 09:49:40 +02:00
Frederik Petersen
6590f4ec7a
Removed deprecated method call
2014-06-13 15:22:14 +02:00
Frederik Petersen
e188b26b19
Merge branch 'dataMining' into polar-api
2014-06-13 15:05:25 +02:00
Frederik Petersen
cfe4636b1c
Merge branch 'dataMining' into polar-api
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.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/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.polars/src/com/sap/sailing/polars/aggregation/PolarFixAggregationWorker.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sse.datamining/META-INF/MANIFEST.MF
2014-06-13 14:55:02 +02:00
Frederik Petersen
4238bd9345
Fixed possible NPE during Regatta removal
2014-06-08 15:33:33 +02:00
Frederik Petersen
c18823acfe
Fixed possible NPE in data importer
2014-06-08 15:07:46 +02:00
Frederik Petersen
ecc499981d
Merge branch 'master' of ssh://sapsailing.com/home/trac/git
2014-06-08 13:21:16 +02:00
Frederik Petersen
1eacc3ddbc
Fixed pre master data regatta serialization
...
all regattas were serialized. Now only those that are part of the
TopLevelMasterData Object are serialized
2014-06-08 13:19:29 +02:00
Frederik Petersen
3c176bc40a
Created java de serialization and circular dependencies (markdown)
2014-06-08 08:51:39 +00:00
Frederik Petersen
5790d8adb6
Updated home (markdown)
2014-06-08 08:50:15 +00:00
Frederik Petersen
6955495e42
Updated home (markdown)
2014-06-08 08:47:47 +00:00
Frederik Petersen
7d8c926530
Updated java de serialization and circular dependencies (markdown)
2014-06-08 08:45:32 +00:00
Frederik Petersen
26d5bc3d88
Created java de serialization and circular dependencies (markdown)
2014-06-08 08:43:51 +00:00
Frederik Petersen
358ff82268
BaseDomainFactory not needed in ImportMasterDataOperation any more
2014-06-07 19:57:30 +02:00
Frederik Petersen
b263074000
Merge branch 'bug-1926-second'
2014-06-07 19:42:31 +02:00
Frederik Petersen
e00619c6b4
Fixed Leaderboard Group Import
2014-06-07 15:56:05 +02:00
Frederik Petersen
e210a73f3c
Replaced assertEquals with assertSame
2014-06-07 15:43:10 +02:00
Frederik Petersen
eb15a0cf2c
Created failing test case for bug-1926
2014-06-07 15:41:02 +02:00
Frederik Petersen
99098dbade
More fixes for bug 1926
2014-06-07 15:36:17 +02:00
Frederik Petersen
630d05ce57
Regattas and Events are now correctly added to RacingEventService
...
during master data import
should fix bug 1926
Regattas have to be deserialized before Series
2014-06-07 14:57:07 +02:00
Frederik Petersen
5aa0d01f29
Added note in ResultSelectionAndApplyDialog
...
This note informs the user that no result will be available for import
until the flag final is set (for Manage2Sail XRR imports)
2014-06-07 10:41:25 +02:00
Frederik Petersen
4eb36fc84c
Added comment to polar chart result presenter
2014-04-25 09:30:44 +02:00
Frederik Petersen
7bd1b832c3
Added polar chart as a datamining result presenter
...
right now it expects the last key in the groupkeys to be the angle for the
chart.
2014-04-18 11:23:03 +02:00
Frederik Petersen
85c21ced4b
Polar Data Mining now uses the cluster group instead of windstepping
...
for grouping wind speeds to clusters
2014-04-11 11:59:07 +02:00
Frederik Petersen
7333c56903
Added test for speed cluster group
2014-04-09 11:49:03 +02:00
Frederik Petersen
445f7ceb11
Added boat class to polar cluster key
...
+created speed cluster for data mining framework
2014-04-09 10:56:17 +02:00
Frederik Petersen
1706f40d6c
Added Boat class as a polar fix groupkey
2014-04-07 11:02:08 +02:00
Frederik Petersen
e3e0a62761
Fixed launch configs and string messages
2014-04-04 09:52:50 +02:00
Frederik Petersen
8c39229c1e
Made sure that linear regression returns constant y
...
for only one added data point
2014-04-03 17:12:43 +02:00
Frederik Petersen
492d9646b2
Introduces dual linear regression for polar data estimation
2014-04-03 16:51:44 +02:00
Frederik Petersen
0593adc2e0
Extended test case for polar data miner
2014-04-03 11:23:28 +02:00
Frederik Petersen
c861ab5b3d
Started creating a test for polar fix grouping
2014-04-03 10:12:34 +02:00
Frederik Petersen
af51393773
Added missing import
2014-03-31 13:42:54 +02:00
Frederik Petersen
c522f816d0
Merge branch 'dataMining' into polar-api
...
Conflicts:
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/server/SailingServiceImpl.java
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-03-31 13:01:13 +02:00
Frederik Petersen
5065f7437b
Started working on porting...
...
...the polar data processing to use the dataming
framework
2014-03-20 13:12:44 +01:00
Frederik Petersen
f6d1c32a35
Removed apache math library
2014-03-19 13:36:25 +01:00
Frederik Petersen
7f3ead381c
Enhanced test for linear regression and added apache regression class
2014-03-19 13:30:27 +01:00
Frederik Petersen
33946a71a7
Merge branch 'dataMining' into polar-api
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
2014-03-19 13:17:35 +01:00