Nick Klose 9f3855e621 Merge branch 'master' into mark-rounding-inference ...

Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java

2013-11-11 13:59:39 +01:00

..

META-INF

unified usage of "require-bundle: org.junit4" for all test bundles

2013-09-02 11:47:06 +02:00

src/com/sap/sailing/server/gateway/serialization/test

Merge branch 'master' into mark-rounding-inference

2013-11-11 13:59:39 +01:00

.classpath

fixed serialization.test mockito dependencies; added logging for start of tracking

2013-04-11 13:57:15 +02:00

.project

Merge branch 'racecommittee_integrated' of

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

build.properties

Merge remote-tracking branch 'server/master'

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

pom.xml

Merge branch 'racecommittee_integrated' of

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