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

..

.gitignore

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

.project

normalized line endings

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

build.properties

normalized line endings

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

feature.xml

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

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

pom.xml

normalized line endings

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