Frank Mittag 358b733fd6 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors ...

# Conflicts:
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch

2017-03-30 18:05:51 +02:00

..

.settings

…

META-INF

Merge branch 'master' into bug2447

2017-01-09 10:05:05 +01:00

src/com/sap/sailing/mongodb/test

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

2017-03-30 18:05:51 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…