Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2005-11-28 13:08:53 -0500
committermkersten2005-11-28 13:08:53 -0500
commit3c2054b5195e3a2b63ed88c694b4f14a784e8900 (patch)
treece3fa7b3ed185cfbe2d2c5bca7c3de4f7e2a560f
parent9a439625ebecafe7943f9c250c862821dd7c9710 (diff)
downloadorg.eclipse.mylyn.tasks-3c2054b5195e3a2b63ed88c694b4f14a784e8900.tar.gz
org.eclipse.mylyn.tasks-3c2054b5195e3a2b63ed88c694b4f14a784e8900.tar.xz
org.eclipse.mylyn.tasks-3c2054b5195e3a2b63ed88c694b4f14a784e8900.zip
3.1 merge
-rw-r--r--org.eclipse.mylyn-feature/feature.xml3
-rw-r--r--org.eclipse.mylyn.bugzilla-feature/feature.xml19
2 files changed, 16 insertions, 6 deletions
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index bb154a5cc..da0abf4d8 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -241,6 +241,9 @@ litigation.
<import plugin="org.eclipse.update.ui"/>
<import plugin="org.eclipse.update.core"/>
<import plugin="org.eclipse.ui.browser"/>
+ <import plugin="org.eclipse.team.ui"/>
+ <import plugin="org.eclipse.team.cvs.core"/>
+ <import plugin="org.eclipse.team.core"/>
</requires>
<plugin
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml
index 280158755..5874255d7 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.xml
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml
@@ -214,19 +214,26 @@ litigation.
</url>
<requires>
- <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.help" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.help.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.pde.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.pde.ui" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.update.core"/>
+ <import plugin="org.eclipse.update.ui"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.team.ui"/>
+ <import plugin="org.eclipse.team.cvs.ui"/>
+ <import plugin="org.eclipse.jdt.ui"/>
+ <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.team.core"/>
+ <import plugin="org.eclipse.team.cvs.core"/>
</requires>
<plugin

Back to the top