Peter Siegmund f169fc8b4f Merge branch 'master' into ubilabs--tracking_app--develop ...

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sse.security.ui/Security UI sdm.launch

2015-03-12 10:06:04 +01:00

..

.settings

fixed execution enviornment for two last 1.6 projects

2015-03-06 17:49:39 +01:00

META-INF

fixed execution enviornment for two last 1.6 projects

2015-03-06 17:49:39 +01:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into ubilabs--tracking_app--develop

2015-03-04 16:46:28 +01:00

.classpath

fixed execution enviornment for two last 1.6 projects

2015-03-06 17:49:39 +01:00

.project

split com.sap.sailing.gateway.serialization in two bundles, creating com.sap.sailing.gateway.serialization.shared.android, see bug 2572

2015-01-14 13:22:22 +01:00

build.gradle

Gradle: changed to local json-simple module

2015-01-16 16:03:40 +01:00

build.properties

split com.sap.sailing.gateway.serialization in two bundles, creating com.sap.sailing.gateway.serialization.shared.android, see bug 2572

2015-01-14 13:22:22 +01:00

pom.xml

upgrade poms of shared and common bundles to 1.7 compiler level

2015-02-10 03:09:27 +01:00