Merge branch 'release/3.7.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.feature / feature.xml

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index df501596241cb7adca55d5d4fa705bdef4692091..92d7ebe7c71900b09d598fe30b62ba24773c79d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,11 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.4.0.qualifier"
+<<<<<<< HEAD
+      version="3.6.1"
+=======
+      version="3.7.0"
+>>>>>>> refs/heads/release/3.7.0
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
@@ -55,6 +59,8 @@
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.equinox.common" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.update.configurator"/>
+      <import plugin="org.eclipse.equinox.p2.publisher.eclipse"/>
    </requires>
 
    <plugin