diff options
| author | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
|---|---|---|
| committer | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
| commit | 12cda553738ca88662624b6f47066b5564549648 (patch) | |
| tree | bfa65b6c38aa566a5f1cc98395da6546a6c6e282 /plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF | |
| parent | 3447749b1a453735ac54fc09ea7680acdbb19b69 (diff) | |
| parent | d65e1d1bdd43feadb43261b85aac2d8aef5e089c (diff) | |
| download | org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.gz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.xz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33
Diffstat (limited to 'plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF index 9def930f5..4fd9da0f9 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF @@ -1,26 +1,26 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.etrice.core.etmap.ui
-Bundle-Vendor: Eclipse eTrice (Incubation)
-Bundle-Version: 0.3.0.qualifier
-Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.3.0",
- org.eclipse.etrice.core.etmap;bundle-version="0.3.0";visibility:=reexport,
- org.eclipse.etrice.core.etphys;bundle-version="0.3.0",
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.compare
-Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.etrice.core.etmap.ui.contentassist,
- org.eclipse.etrice.core.etmap.ui.contentassist.antlr,
- org.eclipse.etrice.core.etmap.ui.internal,
- org.eclipse.etrice.core.etmap.ui.quickfix
-Bundle-Activator: org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator
+Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.etrice.core.etmap.ui +Bundle-Vendor: Eclipse eTrice (Incubation) +Bundle-Version: 0.3.0.qualifier +Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true +Bundle-ActivationPolicy: lazy +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.3.0", + org.eclipse.etrice.core.etmap;bundle-version="0.3.0";visibility:=reexport, + org.eclipse.etrice.core.etphys;bundle-version="0.3.0", + org.eclipse.xtext.ui, + org.eclipse.ui.editors;bundle-version="3.5.0", + org.eclipse.ui.ide;bundle-version="3.5.0", + org.eclipse.xtext.ui.shared, + org.eclipse.ui, + org.eclipse.xtext.builder, + org.antlr.runtime, + org.eclipse.xtext.ui.codetemplates.ui, + org.eclipse.compare +Import-Package: org.apache.log4j +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.eclipse.etrice.core.etmap.ui.contentassist, + org.eclipse.etrice.core.etmap.ui.contentassist.antlr, + org.eclipse.etrice.core.etmap.ui.internal, + org.eclipse.etrice.core.etmap.ui.quickfix +Bundle-Activator: org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator |