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/META-INF | |
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/META-INF')
-rw-r--r-- | plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF index 01500939e..64c3d3f05 100644 --- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF @@ -1,38 +1,38 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.etrice.core.etmap
-Bundle-Vendor: Eclipse eTrice (Incubation)
-Bundle-Version: 0.3.0.qualifier
-Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",
- org.eclipse.etrice.core.etphys;bundle-version="0.3.0",
- org.eclipse.etrice.core.genmodel;bundle-version="0.3.0",
- org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.etrice.core.etmap,
- org.eclipse.etrice.core.etmap.eTMap,
- org.eclipse.etrice.core.etmap.eTMap.impl,
- org.eclipse.etrice.core.etmap.eTMap.util,
- org.eclipse.etrice.core.etmap.formatting,
- org.eclipse.etrice.core.etmap.generator,
- org.eclipse.etrice.core.etmap.parser.antlr,
- org.eclipse.etrice.core.etmap.parser.antlr.internal,
- org.eclipse.etrice.core.etmap.scoping,
- org.eclipse.etrice.core.etmap.serializer,
- org.eclipse.etrice.core.etmap.services,
- org.eclipse.etrice.core.etmap.util,
- org.eclipse.etrice.core.etmap.validation
-
+Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.etrice.core.etmap +Bundle-Vendor: Eclipse eTrice (Incubation) +Bundle-Version: 0.3.0.qualifier +Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true +Bundle-ActivationPolicy: lazy +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0", + org.eclipse.etrice.core.etphys;bundle-version="0.3.0", + org.eclipse.etrice.core.genmodel;bundle-version="0.3.0", + org.eclipse.xtext;visibility:=reexport, + org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport, + org.eclipse.xtext.generator;resolution:=optional, + org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional, + org.eclipse.emf.codegen.ecore;resolution:=optional, + org.eclipse.emf.mwe.utils;resolution:=optional, + org.eclipse.emf.mwe2.launch;resolution:=optional, + org.eclipse.xtext.util, + org.eclipse.emf.ecore, + org.eclipse.emf.common, + org.antlr.runtime +Import-Package: org.apache.log4j, + org.eclipse.xtext.xbase.lib +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.eclipse.etrice.core.etmap, + org.eclipse.etrice.core.etmap.eTMap, + org.eclipse.etrice.core.etmap.eTMap.impl, + org.eclipse.etrice.core.etmap.eTMap.util, + org.eclipse.etrice.core.etmap.formatting, + org.eclipse.etrice.core.etmap.generator, + org.eclipse.etrice.core.etmap.parser.antlr, + org.eclipse.etrice.core.etmap.parser.antlr.internal, + org.eclipse.etrice.core.etmap.scoping, + org.eclipse.etrice.core.etmap.serializer, + org.eclipse.etrice.core.etmap.services, + org.eclipse.etrice.core.etmap.util, + org.eclipse.etrice.core.etmap.validation + |