diff options
author | Tom Schindl | 2016-03-16 14:21:42 +0000 |
---|---|---|
committer | Tom Schindl | 2016-03-16 14:21:42 +0000 |
commit | c012411794c3f0ae66df270d4f9b7affb895a3ad (patch) | |
tree | 56386c8134312736edfb6ac5769f0f89fc2acffc /experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF | |
parent | 63f338ab515119116616568c317c80a15dd72b48 (diff) | |
parent | aa71c74f50697dada863b88cdbb5debd9f3334b1 (diff) | |
download | org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.gz org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.xz org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.zip |
Merge branch 'master' of ssh://tschindl@git.eclipse.org:29418/efxclipse/org.eclipse.efxclipse
Conflicts:
bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
Diffstat (limited to 'experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF')
-rw-r--r-- | experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF b/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF index 824105135..e9912db3e 100644 --- a/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF +++ b/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF @@ -7,7 +7,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.fx.runtime.swt;bundle-version="1.0.0", org.eclipse.fx.osgi.util;bundle-version="0.8.1", org.eclipse.equinox.event;bundle-version="1.3.0", - org.eclipse.fx.runtime.swtutil;bundle-version="1.0.0" + org.eclipse.fx.runtime.swtutil;bundle-version="1.0.0", + org.eclipse.ui.forms;bundle-version="3.6.200", + org.eclipse.jface;bundle-version="3.11.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", |