Merge branch 'master' of
ssh://emueller@git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.releng.git
Conflicts:
org.eclipse.emf.ecp.common.feature/feature.xml
org.eclipse.emf.ecp.editor.feature/feature.xml
org.eclipse.emf.ecp.navigator.feature/feature.xml
org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
org.eclipse.emf.ecp.validation.feature/feature.xml
diff --git a/org.eclipse.emf.ecp.common.feature/feature.xml b/org.eclipse.emf.ecp.common.feature/feature.xml
index 0797244..3b436d6 100644
--- a/org.eclipse.emf.ecp.common.feature/feature.xml
+++ b/org.eclipse.emf.ecp.common.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.common.feature"
label="ECP Common"
- version="0.9.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.editor.feature/feature.xml b/org.eclipse.emf.ecp.editor.feature/feature.xml
index 8021001..1245669 100644
--- a/org.eclipse.emf.ecp.editor.feature/feature.xml
+++ b/org.eclipse.emf.ecp.editor.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.editor.feature"
label="ECP Editor"
- version="0.9.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.navigator.feature/feature.xml b/org.eclipse.emf.ecp.navigator.feature/feature.xml
index 2c551f2..9cd3c0b 100644
--- a/org.eclipse.emf.ecp.navigator.feature/feature.xml
+++ b/org.eclipse.emf.ecp.navigator.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.navigator.feature"
label="ECP Navigator"
- version="0.9.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml b/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
index c0d447f..3f94253 100644
--- a/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
+++ b/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.navigatoreditorbridge.feature"
label="ECP Navigator Editor Bridge"
- version="0.9.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.validation.feature/feature.xml b/org.eclipse.emf.ecp.validation.feature/feature.xml
index 1df284f..19b511a 100644
--- a/org.eclipse.emf.ecp.validation.feature/feature.xml
+++ b/org.eclipse.emf.ecp.validation.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.validation.feature"
label="ECP Validation"
- version="0.9.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
