Armin Zamani 4e29bda14c fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

..

.settings

# added serialization of base domain objects to shared (server + apps) bundle

2013-01-02 19:55:45 +01:00

META-INF

added a test for the serialization and deserialization of course design

2013-03-17 21:32:55 +01:00

src/com/sap/sailing/server/gateway

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

.classpath

# added serialization of base domain objects to shared (server + apps) bundle

2013-01-02 19:55:45 +01:00

.project

# added serialization of base domain objects to shared (server + apps) bundle

2013-01-02 19:55:45 +01:00

build.properties

# added serialization of base domain objects to shared (server + apps) bundle

2013-01-02 19:55:45 +01:00

pom.xml

Forgot the POM...

2013-01-14 10:36:56 +01:00