Lukas Niemeier 422d24eaa5 Merge branch 'otracelog' into racecommittee_app ...

Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java

2013-11-04 01:48:14 +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 'otracelog' into racecommittee_app

2013-11-04 01:48:14 +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