Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-12-11 13:40:49 -0500
committerTom Schindl2016-12-11 13:40:49 -0500
commite92d63011d109f68dce336b916c9e3ba101d44ab (patch)
treeed673bb09c16ed510593edf2ae9503bfd06d0eea /bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
parentd1033754dd1c4eaa153532ad67a73801c85356d2 (diff)
downloadorg.eclipse.efxclipse-e92d63011d109f68dce336b916c9e3ba101d44ab.tar.gz
org.eclipse.efxclipse-e92d63011d109f68dce336b916c9e3ba101d44ab.tar.xz
org.eclipse.efxclipse-e92d63011d109f68dce336b916c9e3ba101d44ab.zip
fixes merge problem
Diffstat (limited to 'bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF')
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF13
1 files changed, 2 insertions, 11 deletions
diff --git a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
index 13f759802..cdcb40cbd 100755
--- a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
@@ -24,17 +24,6 @@ Export-Package: org.eclipse.fx.core;version="3.0.0",
org.eclipse.fx.core.update;version="3.0.0"
Bundle-Vendor: %Bundle-Vendor
Service-Component: OSGI-INF/services/org.eclipse.fx.core.internal.JAXBObjectSerializer.xml,
- OSGI-INF/services/org.eclipse.fx.core.internal.JUtilLoggerFactory.xml,
- OSGI-INF/services/org.eclipse.fx.core.adapter.internal.AdapterServiceImpl.xml,
- OSGI-INF/services/org.eclipse.fx.core.internal.FileSystemServiceImpl.xml,
- OSGI-INF/services/org.eclipse.fx.core.internal.DefaultValueSerializer.xml,
- OSGI-INF/services/org.eclipse.fx.core.internal.DynamicDataStreamHandler.xml,
- OSGI-INF/services/org.eclipse.fx.core.internal.TplURLDynamicDataStreamHandler.xml,
- OSGI-INF/services/org.eclipse.fx.core.internal.OSGiEventBusImpl.xml
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
- com.google.guava;bundle-version="15.0.0"
-Service-Component: OSGI-INF/services/org.eclipse.fx.core.internal.JAXBObjectSerializer.xml,
OSGI-INF/services/org.eclipse.fx.core.adapter.internal.AdapterServiceImpl.xml,
OSGI-INF/services/org.eclipse.fx.core.internal.JUtilLoggerFactory.xml,
OSGI-INF/services/org.eclipse.fx.core.internal.OSGiEventBusImpl.xml,
@@ -43,3 +32,5 @@ Service-Component: OSGI-INF/services/org.eclipse.fx.core.internal.JAXBObjectSeri
OSGI-INF/services/org.eclipse.fx.core.internal.FileSystemServiceImpl.xml,
OSGI-INF/services/org.eclipse.fx.core.internal.DynamicDataStreamHandler.xml
Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ com.google.guava;bundle-version="15.0.0"

Back to the top