D049941 c393031c41 Merge branch 'master' into 'gwt25' ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java

2012-11-22 15:43:03 +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'

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

com.googlecode.java-diff-utils.test

Merge branch 'master' into 'gwt25'

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

com.mongodb.driver

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.declination

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.declination.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.common

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.persistence

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.swisstimingadapter

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.swisstimingadapter.persistence

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.swisstimingadapter.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.tractracadapter

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.domain.tractracadapter.persistence

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.ess40.resultimport

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.ess40.resultimport.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.expeditionconnector

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.expeditionconnector.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.feature

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.feature.p2build

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +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

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.freg.resultimport.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.geocoding

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.geocoding.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.gwt.ui

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.gwt.ui.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.kiworesultimport

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.kiworesultimport.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.mongodb

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.mongodb.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.operationaltransformation

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.operationaltransformation.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.server

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.server.gateway

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.server.replication

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.server.replication.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.server.test

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.targetplatform

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.targetplatform.base

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.targetplatform.updater

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.udpconnector

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.www

Merge branch 'master' into 'gwt25'

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

com.sap.sailing.www.events

…

com.sap.sailing.xcelsiusadapter

Merge branch 'master' into 'gwt25'

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

com.tractrac.clientmodule

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +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

target

…

.gitignore

…

CodeFormatter.xml

Merge branch 'master' into 'gwt25'

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

pom.xml

…