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 /bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF | |
| 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 'bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF')
| -rw-r--r-- | bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF index f37a8a3d7..3fdcd9e6b 100644 --- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF +++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Proposals Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.proposals -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="2.2.0", - org.eclipse.fx.ide.css.cssext;bundle-version="2.2.0", +Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="2.3.0", + org.eclipse.fx.ide.css.cssext;bundle-version="2.3.0", org.eclipse.swt, org.eclipse.jface;bundle-version="3.10.0" Import-Package: org.eclipse.fx.ide.css.extapi, |