marked as merged
diff --git a/org.eclipse.emf.refactor.smells.configuration/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.configuration/META-INF/MANIFEST.MF
index 0b656c5..d267e28 100644
--- a/org.eclipse.emf.refactor.smells.configuration/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.configuration/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+<<<<<<< Upstream, based on branch 'master' of ssh://tarendt@git.eclipse.org/gitroot/refactor/org.eclipse.emf.refactor.smells.git
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SmellsConfiguration
@@ -12,3 +13,19 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.emf.refactor.smells.configuration.core,
org.eclipse.emf.refactor.smells.configuration.managers
+=======
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SmellsConfiguration
+Bundle-SymbolicName: org.eclipse.emf.refactor.smells.configuration;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.smells.configuration.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.emf.refactor.smells;bundle-version="0.7.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emf.refactor.smells.configuration.core,
+ org.eclipse.emf.refactor.smells.configuration.managers
+>>>>>>> 83d04aa version changed
diff --git a/org.eclipse.emf.refactor.smells.generator/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.generator/META-INF/MANIFEST.MF
index dfdf66f..ffea190 100644
--- a/org.eclipse.emf.refactor.smells.generator/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.generator/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+<<<<<<< Upstream, based on branch 'master' of ssh://tarendt@git.eclipse.org/gitroot/refactor/org.eclipse.emf.refactor.smells.git
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SmellsGenerator
@@ -17,3 +18,24 @@
org.eclipse.emf.refactor.smells.generator.interfaces,
org.eclipse.emf.refactor.smells.generator.managers,
org.eclipse.emf.refactor.smells.generator.ui
+=======
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SmellsGenerator
+Bundle-SymbolicName: org.eclipse.emf.refactor.smells.generator;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.smells.generator.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.codegen;bundle-version="2.8.0",
+ org.eclipse.emf.refactor.smells;bundle-version="0.7.0",
+ org.eclipse.jdt.core;bundle-version="3.8.1"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emf.refactor.smells.generator.core,
+ org.eclipse.emf.refactor.smells.generator.interfaces,
+ org.eclipse.emf.refactor.smells.generator.managers,
+ org.eclipse.emf.refactor.smells.generator.ui
+>>>>>>> 83d04aa version changed
diff --git a/org.eclipse.emf.refactor.smells.henshin/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.henshin/META-INF/MANIFEST.MF
index 53a38ce..c5e6d24 100644
--- a/org.eclipse.emf.refactor.smells.henshin/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.henshin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SmellsHenshin
Bundle-SymbolicName: org.eclipse.emf.refactor.smells.henshin;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.0
Bundle-Activator: org.eclipse.emf.refactor.smells.henshin.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.emf.refactor.smells.ocl/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.ocl/META-INF/MANIFEST.MF
index 92f6455..2639bb8 100644
--- a/org.eclipse.emf.refactor.smells.ocl/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.ocl/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: SmellsOcl
+Bundle-Name: SmellsOCL
Bundle-SymbolicName: org.eclipse.emf.refactor.smells.ocl;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.0
Bundle-Activator: org.eclipse.emf.refactor.smells.ocl.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
diff --git a/org.eclipse.emf.refactor.smells.papyrus/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.papyrus/META-INF/MANIFEST.MF
index 6499eb4..43cfbba 100644
--- a/org.eclipse.emf.refactor.smells.papyrus/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.papyrus/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Papyrus
Bundle-SymbolicName: org.eclipse.emf.refactor.smells.papyrus;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.0
Bundle-Activator: org.eclipse.emf.refactor.smells.papyrus.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.emf.refactor.smells.reporter/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.reporter/META-INF/MANIFEST.MF
index 6ba4ad0..7c7312b 100644
--- a/org.eclipse.emf.refactor.smells.reporter/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.reporter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SmellsReporter
Bundle-SymbolicName: org.eclipse.emf.refactor.smells.reporter;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.0
Bundle-Activator: org.eclipse.emf.refactor.smells.reporter.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.emf.refactor.smells.runtime/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.runtime/META-INF/MANIFEST.MF
index 5307bb4..8dce558 100644
--- a/org.eclipse.emf.refactor.smells.runtime/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.runtime/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+<<<<<<< Upstream, based on branch 'master' of ssh://tarendt@git.eclipse.org/gitroot/refactor/org.eclipse.emf.refactor.smells.git
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SmellsRuntime
@@ -17,3 +18,24 @@
Export-Package: org.eclipse.emf.refactor.smells.runtime.core,
org.eclipse.emf.refactor.smells.runtime.managers,
org.eclipse.emf.refactor.smells.runtime.ui
+=======
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SmellsRuntime
+Bundle-SymbolicName: org.eclipse.emf.refactor.smells.runtime;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.smells.runtime.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.common.ui;bundle-version="2.7.0",
+ org.eclipse.emf.refactor.smells;bundle-version="0.7.0",
+ org.eclipse.emf.refactor.smells.configuration;bundle-version="0.7.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emf.refactor.smells.runtime.core,
+ org.eclipse.emf.refactor.smells.runtime.managers,
+ org.eclipse.emf.refactor.smells.runtime.ui
+>>>>>>> 83d04aa version changed
diff --git a/org.eclipse.emf.refactor.smells/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells/META-INF/MANIFEST.MF
index 9b81585..0e1a2e3 100644
--- a/org.eclipse.emf.refactor.smells/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+<<<<<<< Upstream, based on branch 'master' of ssh://tarendt@git.eclipse.org/gitroot/refactor/org.eclipse.emf.refactor.smells.git
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Smells
@@ -16,3 +17,23 @@
org.eclipse.emf.refactor.smells.core,
org.eclipse.emf.refactor.smells.interfaces,
org.eclipse.emf.refactor.smells.managers
+=======
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Smells
+Bundle-SymbolicName: org.eclipse.emf.refactor.smells;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.smells.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.jdt.core;bundle-version="3.8.1",
+ org.eclipse.emf.ecore;bundle-version="2.8.1"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emf.refactor.smells,
+ org.eclipse.emf.refactor.smells.core,
+ org.eclipse.emf.refactor.smells.interfaces,
+ org.eclipse.emf.refactor.smells.managers
+>>>>>>> 83d04aa version changed
