Frederik Petersen 9e1b3df73d Fixed merge problems after merge of master into import_dbdata

2013-06-29 10:54:13 +02:00

..

META-INF

added missing hamcrest dependency to serialization.test manifest

2013-04-11 14:46:43 +02:00

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

Fixed merge problems after merge of master into import_dbdata

2013-06-29 10:54:13 +02: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