Merge branch 'master' into bug2775

Conflicts:
	java/pom.xml
This commit is contained in:
Steffen Schaefer committed 2016-04-12 15:37:57 +02:00
commit 61d296cbdf
640 files changed
+39062 -5780

No files matched your search

+3 -3
View File
@@ -9,9 +9,9 @@ Require-Bundle: com.google.gwt.osgi;bundle-version="2.7.0",
com.sap.sse.common,
com.sap.sse.filestorage
Bundle-ActivationPolicy: lazy
Import-Package: com.google.gwt.core.ext,
com.google.gwt.core.ext.linker,
com.google.gwt.core.ext.linker.impl,
Import-Package: com.google.gwt.core.ext;resolution:=optional,
com.google.gwt.core.ext.linker;resolution:=optional,
com.google.gwt.core.ext.linker.impl;resolution:=optional,
javax.servlet;version="2.6.0",
javax.servlet.descriptor;version="2.6.0",
javax.servlet.http;version="2.6.0",