Merge branch 'master' of ssh://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.releng
Conflicts:
EMF Client Platform (complete with EMFStore Workspace)/feature.xml
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/EMF Client Platform \050complete with EMFStore Workspace\051/feature.xml" "b/EMF Client Platform \050complete with EMFStore Workspace\051/feature.xml"
index f0ff6ee..8c3e50b 100644
--- "a/EMF Client Platform \050complete with EMFStore Workspace\051/feature.xml"
+++ "b/EMF Client Platform \050complete with EMFStore Workspace\051/feature.xml"
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.all"
- label="EMF Client Platform (complete with EMFStore Workspace persistence)"
- version="0.8.9.M910"
+ label="EMF Client Platform (complete with EMFStore Workspace persistence)"
+ version="0.8.9.M911"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.common.feature/feature.xml b/org.eclipse.emf.ecp.common.feature/feature.xml
index 3252e84..70e372c 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.8.9.M910"
+ version="0.8.9.M911"
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 f1ea3bb..13f65ed 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.8.9.M910"
+ version="0.8.9.M911"
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 84e0443..a928fa6 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.8.9.M910"
+ version="0.8.9.M911"
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 5791280..251adc2 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.8.9.M910"
+ version="0.8.9.M911"
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 2c33033..0fd1799 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.8.9.M910"
+ version="0.8.9.M911"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
