Lukas Niemeier 77b59cf6fa Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java

2013-02-19 19:07:08 +01:00

..

.settings

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

META-INF

# moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android

2013-02-18 13:26:32 +01:00

src/com/sap/sailing/server

Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated

2013-02-19 19:07:08 +01:00

.classpath

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

.gitignore

moved all Java stuff to java/ subdir

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

.project

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

build.properties

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +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, Jetty on 8889, Monitoring).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

SailingServer (No Proxy, Jetty on 8889).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

SailingServer (No Proxy, No Tests).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

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

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

SailingServer (No Proxy).launch

Merge branch 'master' into racecommittee_integrated

2013-02-18 16:53:55 +01:00

SailingServer (Proxy, Jetty on 8889).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00

SailingServer (Proxy).launch

added rome.jar to all launch configurations

2013-02-07 16:54:31 +01:00