Merge branch 'release_1.8.0'
Fixed merge
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
index 1f9dadc..724ebe3 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.ecp.emfforms.sdk.feature"
- label="EMF Forms SDK"
- version="1.8.0.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.8.0.qualifier">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.emf.ecp.emfforms.idetooling.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.emfforms.runtime.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.cdo.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.demo.e3.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.e3.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.emfstore.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.license.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.model.controls.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.model.editor.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.workspace.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.emfforms.idetooling.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.emfforms.runtime.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.cdo.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.demo.e3.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.e3.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.emfstore.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.model.controls.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.model.editor.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.workspace.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.edapt.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emfforms.setup.base"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.ecp.emfforms.sdk.feature"
+ label="EMF Forms SDK"
+ version="1.8.0.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.emf.ecp.license.feature"
+ license-feature-version="1.8.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <includes
+ id="org.eclipse.emf.ecp.emfforms.idetooling.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emfforms.runtime.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.cdo.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.demo.e3.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.e3.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emfstore.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.license.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.view.model.controls.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.view.model.editor.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.workspace.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emfforms.idetooling.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emfforms.runtime.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.cdo.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.demo.e3.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.e3.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emfstore.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.view.model.controls.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.view.model.editor.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.workspace.feature.source"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.view.edapt.feature"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.emfforms.setup.base"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
