d036654 769fd75f96 Resolve nerge conflicts

2012-06-08 17:58:37 +02: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-04-22 16:27:21 +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-05-08 11:06:59 +02:00

com.sap.sailing.domain.common

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

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

com.sap.sailing.domain.persistence

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

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

com.sap.sailing.domain.swisstimingadapter

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

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

com.sap.sailing.domain.swisstimingadapter.persistence

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

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

com.sap.sailing.domain.swisstimingadapter.test

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

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

com.sap.sailing.domain.test

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

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

com.sap.sailing.domain.tractracadapter

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

2012-05-08 11:06:59 +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-05-08 11:06:59 +02:00

com.sap.sailing.expeditionconnector.test

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

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

com.sap.sailing.feature

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

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

com.sap.sailing.feature.p2build

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

2012-05-08 11:06:59 +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

…

com.sap.sailing.geocoding.test

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

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

com.sap.sailing.gwt.ui

Resolve nerge conflicts

2012-06-08 17:58:37 +02:00

com.sap.sailing.gwt.ui.test

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

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

com.sap.sailing.mongodb

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

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

com.sap.sailing.mongodb.test

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

2012-05-08 11:06:59 +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

First cut at Blast pattern, WIP.

2012-05-31 17:49:50 +02:00

com.sap.sailing.server.replication

set context class loader for current thread before deserializing

2012-05-07 14:55:18 +02:00

com.sap.sailing.server.replication.test

added failing test case for bug 593 (replicate wind tracks loaded from Mongo)

2012-05-05 19:00:02 +02:00

com.sap.sailing.server.test

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

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

com.sap.sailing.simulator

Interleave for wind on path

2012-06-08 17:54:36 +02:00

com.sap.sailing.simulator.test

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

2012-06-08 13:55:14 +02:00

com.sap.sailing.targetplatform

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

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

com.sap.sailing.targetplatform.base

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

2012-05-08 11:06:59 +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-05-08 11:06:59 +02:00

com.tractrac.clientmodule

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

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

com.tractrac.resultapi

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-04-22 16:27:21 +02:00

target

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

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

.gitignore

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

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

CodeFormatter.xml

…

pom.xml

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

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