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 /tests/org.eclipse.etrice.generator.tests/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 'tests/org.eclipse.etrice.generator.tests/META-INF')
| -rw-r--r-- | tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF index ab7c512bc..34af30d02 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: eTrice Generator Model Tests
-Bundle-SymbolicName: org.eclipse.etrice.generator.tests
-Bundle-Version: 0.3.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: Eclipse eTrice (Incubation)
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",
- org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.junit;bundle-version="4.8.1",
- org.eclipse.osgi;bundle-version="3.6.0",
- org.eclipse.xtext;bundle-version="2.1.1",
- org.eclipse.core.runtime;bundle-version="3.6.0"
-Bundle-Activator: org.eclipse.etrice.generator.InstanceTestsActivator
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: eTrice Generator Model Tests +Bundle-SymbolicName: org.eclipse.etrice.generator.tests +Bundle-Version: 0.3.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Vendor: Eclipse eTrice (Incubation) +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0", + org.eclipse.etrice.generator;bundle-version="0.1.0", + org.junit;bundle-version="4.8.1", + org.eclipse.osgi;bundle-version="3.6.0", + org.eclipse.xtext;bundle-version="2.1.1", + org.eclipse.core.runtime;bundle-version="3.6.0" +Bundle-Activator: org.eclipse.etrice.generator.InstanceTestsActivator +Bundle-ActivationPolicy: lazy |