Axel Uhl 923f633a5e Merge remote-tracking branch 'origin/master' ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	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/client/StringMessages_de.properties

2013-01-23 11:51:38 +01:00

..

.settings

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.google.gwt.osgi

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.googlecode.java-diff-utils

Merge branch 'master' into gwt25

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

com.googlecode.java-diff-utils.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.mongodb.driver

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.sap.sailing.declination

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.declination.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.domain

added a variant of the HighPoint scoring system that awards the winner 10 points; needed for the 2013 ESS

2013-01-22 10:16:24 +01:00

com.sap.sailing.domain.common

Merge remote-tracking branch 'origin/master'

2013-01-23 11:51:38 +01:00

com.sap.sailing.domain.persistence

Use String for internal mapping of collection name to class name

2013-01-21 09:36:46 +01:00

com.sap.sailing.domain.persistence.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.domain.swisstimingadapter

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.domain.swisstimingadapter.persistence

Merge branch 'master' into integration_tests

2013-01-09 23:10:26 +01:00

com.sap.sailing.domain.swisstimingadapter.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.domain.swisstimingreplayadapter

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.domain.swisstimingreplayadapter.test

adjusted formatting in Maven settings.xml

2013-01-10 07:23:08 +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

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.domain.tractracadapter.persistence

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.sap.sailing.domain.tractracadapter.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.ess40.resultimport

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.ess40.resultimport.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.expeditionconnector

whitespace change

2013-01-10 20:01:55 +01:00

com.sap.sailing.expeditionconnector.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.feature

Building seems to fail with new Tycho if build.properties are empty

2013-01-14 10:42:30 +01:00

com.sap.sailing.feature.p2build

Merge branch 'master' into 'integration_tests'

2013-01-07 17:24:21 +01:00

com.sap.sailing.feature.runtime

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.sap.sailing.freg.resultimport

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.freg.resultimport.test

added a variant of the HighPoint scoring system that awards the winner 10 points; needed for the 2013 ESS

2013-01-22 10:16:24 +01:00

com.sap.sailing.geocoding

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.geocoding.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.gwt.ui

Merge remote-tracking branch 'origin/master'

2013-01-23 11:51:38 +01:00

com.sap.sailing.gwt.ui.test

Merge remote-tracking branch 'origin/master'

2013-01-23 11:51:38 +01:00

com.sap.sailing.kiworesultimport

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.sap.sailing.kiworesultimport.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.media.persistence.test

Running version with browser windows-based video player.

2013-01-09 18:47:25 +01:00

com.sap.sailing.mongodb

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

com.sap.sailing.mongodb.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.monitoring

Constrain logging output for successful connections

2013-01-17 16:53:52 +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

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.operationaltransformation

Merge branch 'master' into gwt25

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

com.sap.sailing.operationaltransformation.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.selenium.test

Merge remote-tracking branch 'origin/master'

2013-01-22 16:03:49 +01:00

com.sap.sailing.server

Added MarineAPI to important launch configs

2013-01-22 19:11:49 +01:00

com.sap.sailing.server.gateway

Added JDOM lib from eclipse orbit, updated launch configs, removed gateway dependency from gwt.ui

2013-01-22 18:53:56 +01:00

com.sap.sailing.server.replication

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.server.replication.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.server.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.sap.sailing.targetplatform

Added JDOM lib from eclipse orbit, updated launch configs, removed gateway dependency from gwt.ui

2013-01-22 18:53:56 +01:00

com.sap.sailing.targetplatform.base

New SIGAR version 1.6.4.1

2013-01-11 14:45:08 +01:00

com.sap.sailing.targetplatform.updater

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

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

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

com.tractrac.clientmodule

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

net.sf.marineapi

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

net.sf.marineapi.test

Turn test bundles to fragments.

2013-01-21 15:58:13 +01:00

org.json.simple

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

org.moxieapps.gwt.highcharts

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

org.openqa.selenium.osgi

Merge branch 'gwt25' (including 'master') into 'integration_tests'

2012-11-26 13:11:58 +01:00

target

Merge remote-tracking branch 'external/master' into media

2013-01-17 10:36:05 +01:00

.gitignore

Merge branch 'master' into integration_tests

2013-01-09 09:35:57 +01:00

CodeFormatter.xml

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

pom.xml

Introduced a CollectionNameService, which should protect from clashing collection names

2013-01-17 23:55:43 +01:00