Lennart Hensler ba537b6f20 Merge branch 'master' into updatable-chart_2 ...

Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterLiveSimulatorConnectorImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java

2012-02-28 17:36:29 +01:00

..

.settings

switched all projects to Java7 except for those used by as GWT source

2012-01-19 10:01:36 +01:00

META-INF

added sailingserver/expedition servlet which propagages all Expedition messages, valid or not, to the client

2012-02-14 13:59:38 +01:00

src/com/sap/sailing/server

Merge branch 'master' into updatable-chart_2

2012-02-28 09:48:00 +01:00

WEB-INF

added sailingserver/expedition servlet which propagages all Expedition messages, valid or not, to the client

2012-02-14 13:59:38 +01:00

.classpath

switched all projects to Java7 except for those used by as GWT source

2012-01-19 10:01:36 +01:00

.gitignore

moved all Java stuff to java/ subdir

2011-06-10 16:39:27 +02:00

.project

remove m2e nature from all .project files

2011-11-09 22:06:14 +01:00

build.properties

adjusted target definitions to use Eclipse plugins/ directory

2011-12-28 18:20:24 +01:00

pom.xml

clean up of all version in all pom.xml files

2012-01-04 16:04:23 +01:00

SailingServer (No Proxy, No Tests).launch

adjusted launch configs to new highcharts source bundle

2012-02-28 16:52:49 +01:00

SailingServer (No Proxy, Remote Debug SAP VM).launch

adjusted launch configs to new highcharts source bundle

2012-02-28 16:52:49 +01:00

SailingServer (No Proxy).launch

adjusted launch configs to new highcharts source bundle

2012-02-28 16:52:49 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

adjusted launch configs to new highcharts source bundle

2012-02-28 16:52:49 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

adjusted launch config to also explicitly specify a simulation delay

2012-02-28 17:08:26 +01:00

SailingServer (Proxy).launch

adjusted launch configs to new highcharts source bundle

2012-02-28 16:52:49 +01:00