I059829 9504ddabba Merge branch 'simulator_merge_from_master' of ssh://git.wdf.sap.corp:29418/SAPSail/sapsailingcapture into simulator_merge_from_master ...

Conflicts:
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java

2012-08-09 11:18:43 +03:00

..

.settings

…

com.google.gwt.osgi

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.googlecode.java-diff-utils

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.googlecode.java-diff-utils.test

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.mongodb.driver

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.sap.sailing.declination

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.declination.test

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.sap.sailing.domain

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.common

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.persistence

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.swisstimingadapter

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.swisstimingadapter.persistence

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.swisstimingadapter.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.tractracadapter

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.domain.tractracadapter.persistence

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.sap.sailing.expeditionconnector

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.expeditionconnector.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.feature

some cleanup to make the maven build work...

2012-07-02 19:18:21 +02:00

com.sap.sailing.feature.p2build

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.feature.runtime

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.sap.sailing.geocoding

use multiple geonames.org accounts

2012-06-23 19:58:20 +02:00

com.sap.sailing.geocoding.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.gwt.ui

update styling of sliders

2012-07-09 11:33:15 +02:00

com.sap.sailing.gwt.ui.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.kiworesultimport

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.kiworesultimport.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.mongodb

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.mongodb.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.operationaltransformation

Merge remote-tracking branch 'origin/master' into simulator

2012-05-08 11:06:59 +02:00

com.sap.sailing.operationaltransformation.test

Merge remote-tracking branch 'origin/master' into simulator

2012-05-08 11:06:59 +02:00

com.sap.sailing.server

Changes required due to merge from master.

2012-07-02 11:05:41 +02:00

com.sap.sailing.server.replication

extracted serializable class to ensure it's found in an OSGi setup

2012-06-15 14:00:25 +02:00

com.sap.sailing.server.replication.test

added more missing locking to replication tests

2012-06-29 13:05:47 +02:00

com.sap.sailing.server.test

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.simulator

Merge branch 'simulator_merge_from_master' of ssh://git.wdf.sap.corp:29418/SAPSail/sapsailingcapture into simulator_merge_from_master

2012-08-09 11:18:43 +03:00

com.sap.sailing.simulator.test

implemented class PolarDiagramCSV and modified PolarDiagram49 to allow this

2012-08-08 18:56:58 +03:00

com.sap.sailing.targetplatform

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.targetplatform.base

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.sap.sailing.targetplatform.updater

removed unused files from target platform updater project

2012-04-24 10:56:40 +02:00

com.sap.sailing.udpconnector

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.sap.sailing.www

Merge remote-tracking branch 'origin/master' into simulator

2012-05-08 11:06:59 +02:00

com.sap.sailing.www.events

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

com.sap.sailing.xcelsiusadapter

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

com.tractrac.clientmodule

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

org.json.simple

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

org.moxieapps.gwt.highcharts

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

target

Merge remote-tracking branch 'origin/master' into simulator

2012-07-02 11:01:41 +02:00

.gitignore

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

CodeFormatter.xml

…

pom.xml

fix maven build

2012-07-05 13:58:21 +02:00