From e5fd2c45b0e096449174c2a607eea3933cb39f61 Mon Sep 17 00:00:00 2001
From: cvs2git
Date: Sat, 23 Dec 2006 00:40:34 +0000
Subject: This commit was manufactured by cvs2svn to create branch
 'e_3_2_m_1_0'.

Sprout from master 2006-12-23 00:22:51 UTC mkersten 'Version update'
Cherrypick from e_3_2 2006-12-23 00:40:33 UTC mkersten 'Version update':
    org.eclipse.mylyn-feature/feature.xml
    org.eclipse.mylyn.bugzilla-feature/feature.xml
    org.eclipse.mylyn.trac-feature/feature.xml
Delete:
    org.eclipse.mylyn-feature/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.bugzilla-feature/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.trac-feature/.settings/org.eclipse.mylar.tasklist.prefs---
 .../.settings/org.eclipse.mylar.tasklist.prefs                   | 4 ----
 org.eclipse.mylyn-feature/feature.xml                            | 9 +++------
 .../.settings/org.eclipse.mylar.tasklist.prefs                   | 4 ----
 org.eclipse.mylyn.bugzilla-feature/feature.xml                   | 6 +-----
 .../.settings/org.eclipse.mylar.tasklist.prefs                   | 4 ----
 org.eclipse.mylyn.trac-feature/feature.xml                       | 6 +-----
 6 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 org.eclipse.mylyn-feature/.settings/org.eclipse.mylar.tasklist.prefs
 delete mode 100644 org.eclipse.mylyn.bugzilla-feature/.settings/org.eclipse.mylar.tasklist.prefs
 delete mode 100644 org.eclipse.mylyn.trac-feature/.settings/org.eclipse.mylar.tasklist.prefs

diff --git a/org.eclipse.mylyn-feature/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn-feature/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index 58c2077a1..000000000
--- a/org.eclipse.mylyn-feature/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:36:21 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index 7948943ea..8abb16133 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -214,11 +214,11 @@ litigation.
    </license>
 
    <url>
-      <update label="Mylar for Eclipse 3.3" url="http://download.eclipse.org/technology/mylar/update-site/e3.3"/>
+      <update label="Mylar for Eclipse 3.2" url="http://download.eclipse.org/technology/mylar/update-site/e3.2"/>
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface.text"/>
@@ -229,11 +229,8 @@ litigation.
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.mylar.tasks.ui"/>
-      <import plugin="org.eclipse.mylar.context.core"/>
-      <import plugin="org.eclipse.mylar.tasks.core"/>
-      <import plugin="org.eclipse.mylar.monitor"/>
       <import plugin="org.eclipse.search"/>
+      <import feature="org.eclipse.platform" version="3.2.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.bugzilla-feature/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.bugzilla-feature/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index 9c388898c..000000000
--- a/org.eclipse.mylyn.bugzilla-feature/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:43:43 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml
index 7bc34d706..10f426b80 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.xml
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml
@@ -214,13 +214,11 @@ litigation.
    </license>
 
    <url>
-      <update label="Mylar for Eclipse 3.3" url="http://download.eclipse.org/technology/mylar/update-site/e3.3"/>
+      <update label="Mylar for Eclipse 3.2" url="http://download.eclipse.org/technology/mylar/update-site/e3.2"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylar.context.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylar.tasks.core"/>
       <import plugin="org.eclipse.ui" 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"/>
@@ -234,9 +232,7 @@ litigation.
       <import plugin="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.update.ui"/>
-      <import plugin="org.eclipse.mylar.tasks.ui"/>
       <import feature="org.eclipse.mylar_feature" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylar.bugzilla.core"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.trac-feature/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.trac-feature/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index e7fa013aa..000000000
--- a/org.eclipse.mylyn.trac-feature/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:54:57 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.trac-feature/feature.xml b/org.eclipse.mylyn.trac-feature/feature.xml
index 05fe59854..a420612f7 100644
--- a/org.eclipse.mylyn.trac-feature/feature.xml
+++ b/org.eclipse.mylyn.trac-feature/feature.xml
@@ -214,18 +214,14 @@ litigation.
    </license>
 
    <url>
-      <update label="Mylar for Eclipse 3.3" url="http://download.eclipse.org/technology/mylar/update-site/e3.3"/>
+      <update label="Mylar for Eclipse 3.2" url="http://download.eclipse.org/technology/mylar/update-site/e3.2"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.mylar.context.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylar.tasks.ui"/>
-      <import plugin="org.eclipse.mylar.tasks.core"/>
       <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.mylar.trac.core"/>
       <import feature="org.eclipse.mylar_feature" version="1.0.1" match="greaterOrEqual"/>
    </requires>
 
-- 
cgit v1.2.3