Fredrik Teschke 0ecb523a0a Merge remote-tracking branch 'origin/jan-team-image' into ftes-file-storage ...

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java

2015-01-23 20:12:38 +01:00

..

.settings

deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui

2015-01-23 19:33:39 +01:00

META-INF

deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui

2015-01-23 19:33:39 +01:00

resources/com/sap/sse/filestorage

deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui

2015-01-23 19:33:39 +01:00

src/com/sap/sse/filestorage

Merge remote-tracking branch 'origin/jan-team-image' into ftes-file-storage

2015-01-23 20:12:38 +01:00

.classpath

deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui

2015-01-23 19:33:39 +01:00

.project

added projects and launch configuration for filestorage

2015-01-22 17:31:26 +01:00

build.properties

deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui

2015-01-23 19:33:39 +01:00

pom.xml

added projects and launch configuration for filestorage

2015-01-22 17:31:26 +01:00