Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Jongman2012-06-07 16:58:57 -0400
committerWim Jongman2012-06-07 16:58:57 -0400
commitca107560b7534cf7e13e3b546cc69d722f6023ae (patch)
tree3d30f03cb5597015ad54b3417e6bf3795854fe29
parent5b17ebd443853d383cc7dd2ba0bc22d0b15b908d (diff)
parent32f3df56617fcb31345a6868f80bb40ce687d0b3 (diff)
downloadorg.eclipse.ecf-ca107560b7534cf7e13e3b546cc69d722f6023ae.tar.gz
org.eclipse.ecf-ca107560b7534cf7e13e3b546cc69d722f6023ae.tar.xz
org.eclipse.ecf-ca107560b7534cf7e13e3b546cc69d722f6023ae.zip
Merge branch 'master' of ssh://wjongman@git.eclipse.org/gitroot/ecf/org.eclipse.ecf.gitR-Release_HEAD-sdk_feature-76_2012-06-08_01-43-33
-rw-r--r--framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index a89143346..8a13402cb 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Export-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.util,
org.eclipse.ecf.internal.core;x-internal:=true
Import-Package: org.eclipse.core.runtime.jobs,
- org.eclipse.equinox.concurrent.future;version="1.0.0";resolution:=optional,
+ org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.log;version="1.3.0",
org.osgi.util.tracker;version="1.3.2"

Back to the top