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 /releng/cmdtools | |
| 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 'releng/cmdtools')
| -rw-r--r-- | releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd b/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd index 6e8bcef54..6e5e22675 100644 --- a/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd +++ b/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd @@ -8,7 +8,9 @@ Service-Component: \ org.eclipse.emf.ecore,\ org.eclipse.emf.ecore.xmi,\ org.eclipse.emf.common,\ - org.eclipse.xtext + org.eclipse.xtext,\ + javax.inject Private-Package: \ org.eclipse.fx.code.editor.ldef.app -runee: JavaSE-1.8 +-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
\ No newline at end of file |