diff options
| author | Dani Megert | 2012-02-16 12:49:50 +0000 |
|---|---|---|
| committer | Dani Megert | 2012-02-16 12:49:50 +0000 |
| commit | 749bc053d9e46e7fd486aec21fa85370cee00f65 (patch) | |
| tree | 61598febebd679a1c67e9dbf2d0a17c79facc789 | |
| parent | 7625f7f6d31d6db7baf54e058b7d6e7368fe145c (diff) | |
| download | eclipse.platform.common-r363_v20120216.tar.gz eclipse.platform.common-r363_v20120216.tar.xz eclipse.platform.common-r363_v20120216.zip | |
Backported fix for bug 251776: [Content Type] Need a better wayr363_v20120216R3_6_maintenance
to arbitrate content types and/or editor associations
3 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF b/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF index 5998cf3d1..065b9422a 100644 --- a/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.platform.doc.isv; singleton:=true -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.6.3.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)" diff --git a/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html b/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html index 0e91a52bd..540ba6391 100644 --- a/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html +++ b/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html @@ -2,7 +2,7 @@ <html lang="en"> <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > +<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <title>Platform Extension Points</title> @@ -86,6 +86,7 @@ of the platform infrastructure: <li><a href="org_eclipse_ui_fontDefinitions.html">org.eclipse.ui.fontDefinitions</a></li> <li><a href="org_eclipse_ui_handlers.html">org.eclipse.ui.handlers</a></li> <li><a href="org_eclipse_ui_helpSupport.html">org.eclipse.ui.helpSupport</a></li> + <li><a href="org_eclipse_ui_ide_editorAssociationOverride.html">org.eclipse.ui.ide.editorAssociationOverride</a></li> <li><a href="org_eclipse_ui_ide_filesystemSupport.html">org.eclipse.ui.ide.filesystemSupport</a></li> <li><a href="org_eclipse_ui_ide_markerHelp.html">org.eclipse.ui.ide.markerHelp</a></li> <li><a href="org_eclipse_ui_ide_markerImageProviders.html">org.eclipse.ui.ide.markerImageProviders</a></li> diff --git a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml index 25a72fd93..a1f9eec2d 100644 --- a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml +++ b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml @@ -434,6 +434,7 @@ <topic label="org.eclipse.ui.fontDefinitions" href="reference/extension-points/org_eclipse_ui_fontDefinitions.html"/> <topic label="org.eclipse.ui.handlers" href="reference/extension-points/org_eclipse_ui_handlers.html"/> <topic label="org.eclipse.ui.helpSupport" href="reference/extension-points/org_eclipse_ui_helpSupport.html"/> + <topic label="org.eclipse.ui.ide.editorAssociationOverride" href="reference/extension-points/org_eclipse_ui_ide_editorAssociationOverride.html"/> <topic label="org.eclipse.ui.ide.filesystemSupport" href="reference/extension-points/org_eclipse_ui_ide_filesystemSupport.html"/> <topic label="org.eclipse.ui.ide.markerHelp" href="reference/extension-points/org_eclipse_ui_ide_markerHelp.html"/> <topic label="org.eclipse.ui.ide.markerImageProviders" href="reference/extension-points/org_eclipse_ui_ide_markerImageProviders.html"/> |