commit 0834234cc6740d39a4e117f5da99821b25888b4f
author John Arthorne <johna> Mon Oct 04 14:38:20 2010 +0000
committer John Arthorne <johna> Mon Oct 04 14:38:20 2010 +0000
tree b2d15a36778b6cccedde0bab0597e06ac5f2d3b1
parent 492dc6b7deef9bd008107115205f1475c5fcebc1

merge with HEAD

platform/org.eclipse.platform/META-INF/MANIFEST.MF

diff --git a/platform/org.eclipse.platform/META-INF/MANIFEST.MF b/platform/org.eclipse.platform/META-INF/MANIFEST.MF
index ae2c5d8..42fa7af 100644
--- a/platform/org.eclipse.platform/META-INF/MANIFEST.MF
+++ b/platform/org.eclipse.platform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.platform; singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-ClassPath: platform.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

platform/org.eclipse.sdk/META-INF/MANIFEST.MF

diff --git a/platform/org.eclipse.sdk/META-INF/MANIFEST.MF b/platform/org.eclipse.sdk/META-INF/MANIFEST.MF
index 9a0fc72..326314b 100644
--- a/platform/org.eclipse.sdk/META-INF/MANIFEST.MF
+++ b/platform/org.eclipse.sdk/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-ersion: 1.0
+Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.sdk; singleton:=true

platform/org.eclipse.sdk/plugin.xml

diff --git a/platform/org.eclipse.sdk/plugin.xml b/platform/org.eclipse.sdk/plugin.xml
index 168c21f..467aad1 100644
--- a/platform/org.eclipse.sdk/plugin.xml
+++ b/platform/org.eclipse.sdk/plugin.xml
@@ -326,11 +326,4 @@
       </engine>
     </extension>
     
-    <extension
-          id="blort"
-          name="test"
-          point="org.eclipse.core.resources.builders">
-    </extension>
-    
-
 </plugin>