Peter Siegmund b25fca66b9 fixed wrong merge conflict

2014-11-19 08:57:45 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

META-INF

introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util

2014-06-02 23:17:49 +02:00

src/com/sap/sailing/server/gateway

fixed wrong merge conflict

2014-11-19 08:57:45 +01:00

.classpath

Merge branch 'racecommittee_integrated' of

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

.gitignore

fixed a bunch of NPE issues in the RCapp

2014-01-27 10:26:59 +01: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

Fiddlig with Java 8 compiler settings...

2014-10-17 11:40:54 +02:00