Axel Uhl 211d1f9844 Merge branch 'master' into gwt25 ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
	java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html

2013-01-09 17:16:07 +01:00

..

.settings

…

com.google.gwt.osgi

…

com.googlecode.java-diff-utils

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.googlecode.java-diff-utils.test

Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.

2013-01-09 12:13:15 +01:00

com.mongodb.driver

…

com.sap.sailing.declination

…

com.sap.sailing.declination.test

Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.

2013-01-09 12:13:15 +01:00

com.sap.sailing.domain

Merge branch 'master' into gwt25

2013-01-09 17:16:07 +01:00

com.sap.sailing.domain.common

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.domain.persistence

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.domain.swisstimingadapter

Merge branch 'master' into gwt25

2013-01-09 17:16:07 +01:00

com.sap.sailing.domain.swisstimingadapter.persistence

Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.

2013-01-09 12:13:15 +01:00

com.sap.sailing.domain.swisstimingadapter.test

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.domain.swisstimingreplayadapter

Merge branch 'master' into gwt25

2013-01-09 17:16:07 +01:00

com.sap.sailing.domain.swisstimingreplayadapter.test

added ignored tests that print the SwissTiming archive versions for the 49er Race 3 of the 2012 Olympics

2013-01-08 14:55:49 +01:00

com.sap.sailing.domain.test

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.domain.tractracadapter

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.domain.tractracadapter.persistence

…

com.sap.sailing.domain.tractracadapter.test

added missing .gitignore for com.sap.sailing.domain.tractracadapter.test

2013-01-02 23:42:43 +01:00

com.sap.sailing.ess40.resultimport

…

com.sap.sailing.ess40.resultimport.test

…

com.sap.sailing.expeditionconnector

Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.

2013-01-09 12:13:15 +01:00

com.sap.sailing.expeditionconnector.test

Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.

2013-01-09 12:13:15 +01:00

com.sap.sailing.feature

minor stuff

2012-12-11 17:24:11 +01:00

com.sap.sailing.feature.p2build

Merge remote-tracking branch 'server/master'

2012-11-29 16:22:23 +01:00

com.sap.sailing.feature.runtime

…

com.sap.sailing.freg.resultimport

…

com.sap.sailing.freg.resultimport.test

…

com.sap.sailing.geocoding

…

com.sap.sailing.geocoding.test

…

com.sap.sailing.gwt.ui

Merge branch 'master' into gwt25

2013-01-09 17:16:07 +01:00

com.sap.sailing.gwt.ui.test

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.kiworesultimport

…

com.sap.sailing.kiworesultimport.test

…

com.sap.sailing.mongodb

…

com.sap.sailing.mongodb.test

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.monitoring

Changed logging to FINEST for restarting message to avoid filling logs when service has failed before

2013-01-08 14:36:38 +01:00

com.sap.sailing.nmeaconnector

extended marineapi for proprietary WIBAT message emitted by SailTimer WindVane

2013-01-07 10:32:55 +01:00

com.sap.sailing.nmeaconnector.test

deleted more files from bin/ accidentally checked in

2013-01-08 20:24:55 +01:00

com.sap.sailing.operationaltransformation

Merge branch 'master' into gwt25

2013-01-09 17:16:07 +01:00

com.sap.sailing.operationaltransformation.test

…

com.sap.sailing.server

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.server.gateway

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.server.replication

…

com.sap.sailing.server.replication.test

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.server.test

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.targetplatform

…

com.sap.sailing.targetplatform.base

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.targetplatform.updater

…

com.sap.sailing.udpconnector

Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.

2013-01-09 12:13:15 +01:00

com.sap.sailing.www

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.sap.sailing.www.events

fixed ESS40 mobile static HTML page

2012-12-05 21:16:42 +01:00

com.sap.sailing.xcelsiusadapter

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

com.tractrac.clientmodule

…

net.sf.marineapi

made getInstance() synchronized on SentenceFactory which avoids a race condition during factory initialization

2013-01-08 20:48:42 +01:00

net.sf.marineapi.test

removed accidentally commited files from bin/ directories and added corresponding .gitignore entries

2013-01-08 20:20:19 +01:00

org.json.simple

…

org.moxieapps.gwt.highcharts

…

target

adjusted monitoring properties to check for index.html for www bundle instead of / which always responds

2012-12-20 10:36:16 +01:00

.gitignore

added java/log to .gitignore

2013-01-08 20:22:06 +01:00

CodeFormatter.xml

…

pom.xml

added nmeaconnector to pom.xml maven hierarchy

2013-01-07 09:39:26 +01:00