eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-11 23:00:59 +00:00
Code Activity
Files
bf31f4c1ea7542c2e94b154548b08d737ef5fe60
sailing-analytics/java/com.sap.sailing.server
T
History
Fredrik Teschke bf31f4c1ea Merge branch 'master' into gpsfixstore-independent-of-race 
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-04-07 23:35:57 +02:00
..
.settings
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
META-INF
Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
2014-03-28 18:34:58 +01:00
src/com/sap/sailing/server
Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
2014-03-28 18:34:58 +01:00
.classpath
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
.gitignore
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02: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
pom.xml
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (No Proxy, Jetty on 8889).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (No Proxy, No Tests).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (No Proxy, Remote Debug SAP VM).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (No Proxy, winddbTest).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (No Proxy).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (Proxy, Jetty on 8889).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (Proxy, Remote Debug SAP VM).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (Proxy, SwissTiming Live Simulation).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (Proxy, winddbTest).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00
SailingServer (Proxy).launch
Merge branch 'master' into gpsfixstore-independent-of-race
2014-04-07 23:35:57 +02:00