Axel Uhl 34bab83ba2 Merge remote-tracking branch 'server/master' ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway.serialization.test/build.properties

2013-04-11 14:13:34 +02:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

com.google.gwt.osgi

Merge branch 'racecommittee_integrated' of

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

com.googlecode.java-diff-utils

Merge branch 'racecommittee_integrated' of

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

com.googlecode.java-diff-utils.test

Merge branch 'racecommittee_integrated' of

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

com.mongodb.driver

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.declination

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.declination.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain

Merge branch 'master' into racecommittee_integrated

2013-04-11 13:39:51 +08:00

com.sap.sailing.domain.common

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.persistence

Merge remote-tracking branch 'server/master'

2013-04-11 14:13:34 +02:00

com.sap.sailing.domain.shared.android

Merge branch 'master' into racecommittee_integrated

2013-04-11 13:39:51 +08:00

com.sap.sailing.domain.shared.android.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.swisstimingadapter

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.swisstimingadapter.persistence

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.swisstimingadapter.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.swisstimingreplayadapter

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.swisstimingreplayadapter.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.test

Merge branch 'master' into racecommittee_integrated

2013-04-11 13:39:51 +08:00

com.sap.sailing.domain.tractracadapter

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.tractracadapter.persistence

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.domain.tractracadapter.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.ess40.resultimport

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.ess40.resultimport.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.expeditionconnector

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.expeditionconnector.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.feature

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.feature.p2build

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.feature.runtime

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.freg.resultimport

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.freg.resultimport.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.geocoding

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.geocoding.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.gwt.ui

Merge remote-tracking branch 'server/master'

2013-04-11 14:13:34 +02:00

com.sap.sailing.gwt.ui.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.kiworesultimport

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.kiworesultimport.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.media.persistence.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.mongodb

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.mongodb.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.monitoring

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.nmeaconnector

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.nmeaconnector.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.odf.resultimport

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.odf.resultimport.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.operationaltransformation

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.operationaltransformation.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.selenium.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.server

Fixed nasty bug where races couldn't be added to a regatta

2013-04-11 12:26:41 +08:00

com.sap.sailing.server.gateway

Merge branch 'master' into racecommittee_integrated

2013-04-11 13:39:51 +08:00

com.sap.sailing.server.gateway.ess40

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.server.gateway.serialization

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.server.gateway.serialization.test

Merge remote-tracking branch 'server/master'

2013-04-11 14:13:34 +02:00

com.sap.sailing.server.gateway.test

Merge remote-tracking branch 'server/master'

2013-04-11 14:13:34 +02:00

com.sap.sailing.server.replication

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.server.replication.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.server.test

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.targetplatform

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.targetplatform.base

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.targetplatform.updater

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.udpconnector

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.www

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.www.events

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.xcelsiusadapter

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.xrr.resultimport

Merge branch 'racecommittee_integrated' of

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

com.sap.sailing.xrr.resultimport.test

Merge branch 'racecommittee_integrated' of

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

com.tractrac.clientmodule

Merge branch 'racecommittee_integrated' of

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

net.sf.marineapi

Merge branch 'racecommittee_integrated' of

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

net.sf.marineapi.test

Merge branch 'racecommittee_integrated' of

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

org.json.simple

Merge branch 'racecommittee_integrated' of

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

org.moxieapps.gwt.highcharts

Merge branch 'racecommittee_integrated' of

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

org.openqa.selenium.osgi

Merge branch 'racecommittee_integrated' of

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

target

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

CodeFormatter.xml

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