Henri Kohlberg e4ea366a1e Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104 ...

# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

2018-09-26 15:10:17 +02:00

..

.settings

normalized line endings

2017-05-16 09:42:02 +02:00

META-INF

implemented creation of session per start and setting start line

2018-04-30 13:46:51 +02:00

resources

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

2018-09-26 15:10:17 +02:00

src/com/sap/sailing/server/gateway

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

2018-09-26 15:10:17 +02:00

WEB-INF

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

2018-02-21 10:48:43 +01:00

webservices

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

2018-09-26 15:10:17 +02:00

.classpath

normalized line endings

2017-05-16 09:42:02 +02:00

.gitignore

…

.project

normalized line endings

2017-05-16 09:42:02 +02:00

build.properties

bug4718 Removed no longer existing directory from build.properties file

2018-08-22 15:09:03 +02:00

main.css

Bug 2816: Changed more font-family declarations to use the new "Open

2015-05-26 15:02:38 +02:00

pom.xml

normalized line endings

2017-05-16 09:42:02 +02:00