Nidhi Sawhney 3eb003a912 Merge remote-tracking branch 'origin/simulator' into simulator ...

Conflicts:
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/SailingSimulator.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/SailingSimulatorImpl.java

2012-06-08 13:55:14 +02:00

..

.settings

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

META-INF

changed the manifeest for the test to support KnotSpeedImpl

2012-05-29 12:10:25 +03:00

src/com/sap/sailing/simulator/test

Merge remote-tracking branch 'origin/simulator' into simulator

2012-06-08 13:55:14 +02:00

.classpath

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

.project

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

build.properties

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

pom.xml

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00