Fredrik Teschke 0fa71f8fae Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race ...

Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java

2014-02-15 22:27:05 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

mocked enough of the OSGi service fetching in SailingServiceImpl to let testPolarSheetGenerationService run green again

2013-12-06 09:44:17 +01:00

resources/com/sap/sailing/gwt/ui/test

Merge branch 'racecommittee_integrated' of

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

src/com/sap/sailing/gwt/ui/test

Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race

2014-02-15 22:27:05 +01:00

.classpath

Merge branch 'racecommittee_integrated' of

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

.gitignore

renamed GWT test case launches and provided a launch for the no-proxy set-up

2013-12-06 13:38:50 +01:00

.project

Merge branch 'racecommittee_integrated' of

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

build.properties

Merge branch 'racecommittee_integrated' of

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

GwtTestCases (no proxy).launch

renamed GWT test case launches and provided a launch for the no-proxy set-up

2013-12-06 13:38:50 +01:00

GwtTestCases (proxy).launch

renamed GWT test case launches and provided a launch for the no-proxy set-up

2013-12-06 13:38:50 +01:00

pom.xml

Merge branch 'racecommittee_integrated' of

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