3.1 merge
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index ae53109..73e4275 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.mylar_feature"
label="Mylar Task List (Required)"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
provider-name="Eclipse.org"
plugin="org.eclipse.mylar">
@@ -230,28 +230,28 @@
id="org.eclipse.mylar.doc"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
<plugin
id="org.eclipse.mylar"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
<plugin
id="org.eclipse.mylar.core"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
<plugin
id="org.eclipse.mylar.tasklist"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
</feature>
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml
index 8b51168..0852c29 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.xml
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.mylar.bugzilla_feature"
label="Mylar Connector: Bugzilla"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
provider-name="Eclipse.org"
plugin="org.eclipse.mylar">
@@ -232,7 +232,7 @@
<import plugin="org.eclipse.update.ui"/>
<import plugin="org.eclipse.team.core"/>
<import plugin="org.eclipse.team.cvs.core"/>
- <import feature="org.eclipse.mylar_feature" version="0.5.3" match="greaterOrEqual"/>
+ <import feature="org.eclipse.mylar_feature" version="0.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.mylar.ide"/>
@@ -244,21 +244,21 @@
id="org.eclipse.mylar.bugzilla.core"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
<plugin
id="org.eclipse.mylar.bugzilla.ui"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
<plugin
id="org.eclipse.mylar.bugs"
download-size="0"
install-size="0"
- version="0.5.3.v20060629-1530"
+ version="0.6.0"
unpack="false"/>
</feature>
diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
index a4d1225..0d1aefc 100644
--- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Bugzilla Client Plug-in
Bundle-SymbolicName: org.eclipse.mylar.bugzilla.core; singleton:=true
-Bundle-Version: 0.5.3.v20060629-1530
+Bundle-Version: 0.6.0
Bundle-Activator: org.eclipse.mylar.internal.bugzilla.core.BugzillaPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
index 7f06ca5..48ae1c6 100644
--- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Bugzilla Client Ui Plug-in
Bundle-SymbolicName: org.eclipse.mylar.bugzilla.ui; singleton:=true
-Bundle-Version: 0.5.3.v20060629-1530
+Bundle-Version: 0.6.0
Bundle-Activator: org.eclipse.mylar.internal.bugzilla.ui.BugzillaUiPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
index 206f72f..0c25e4f 100644
--- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Documentation Plugin
Bundle-SymbolicName: org.eclipse.mylar.doc; singleton:=true
-Bundle-Version: 0.5.3.v20060629-1300
+Bundle-Version: 0.6.0
Bundle-Localization: plugin
Eclipse-AutoStart: true
Bundle-Vendor: Eclipse.org
diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index 4bf2a2d..0695ac8 100644
--- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Bugs Plug-in
Bundle-SymbolicName: org.eclipse.mylar.bugs; singleton:=true
-Bundle-Version: 0.5.3.v20060629-1530
+Bundle-Version: 0.6.0
Bundle-Activator: org.eclipse.mylar.internal.bugs.MylarBugsPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index 8a98474..fc8d5a7 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mylar TaskList Plug-in
Bundle-SymbolicName: org.eclipse.mylar.tasklist; singleton:=true
-Bundle-Version: 0.5.3.v20060629-1530
+Bundle-Version: 0.6.0
Bundle-Activator: org.eclipse.mylar.provisional.tasklist.MylarTaskListPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
