Nicolas 69f3c5c460 Merge remote-tracking branch 'origin/master' into mark-rounding-inference ...

Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java

2014-05-13 15:53:28 +02:00

..

.settings

Updated the gwt ui jre to 1.7 to make the tests runnable

2014-04-17 17:17:50 +02:00

META-INF

removed export of igtimiadapter.impo to gwt.ui.test as it doesn't seem to be required

2014-04-27 13:45:43 +02: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 mark-rounding-inference

2014-05-13 15:53:28 +02:00

.classpath

Updated the gwt ui jre to 1.7 to make the tests runnable

2014-04-17 17:17:50 +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