Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2009-02-27 07:44:07 -0500
committerTomasz Zarna2009-02-27 07:44:07 -0500
commit2e4b8b148821815e4b69494b8291ba3ff706ac24 (patch)
tree94cb8d2cd19147b6fc4366e92b6b816352eba58e /bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
parentb4bda40a7d75926c5094e4c6c115dd55162cbed6 (diff)
downloadeclipse.platform.team-2e4b8b148821815e4b69494b8291ba3ff706ac24.tar.gz
eclipse.platform.team-2e4b8b148821815e4b69494b8291ba3ff706ac24.tar.xz
eclipse.platform.team-2e4b8b148821815e4b69494b8291ba3ff706ac24.zip
bug 201116: [Viewers] Compare will silently discard additional contentMergeViewers associated with the same file extension
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml')
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml15
1 files changed, 9 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
index 844a64108..0cf7b3573 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -307,19 +307,22 @@
<extension
point="org.eclipse.compare.contentMergeViewers">
<viewer
- extensions="class,exe,dll,binary,zip,jar"
class="org.eclipse.compare.internal.BinaryCompareViewerCreator"
- id="org.eclipse.compare.BinaryCompareViewerCreator">
+ extensions="class,exe,dll,binary,zip,jar"
+ id="org.eclipse.compare.BinaryCompareViewerCreator"
+ label="%BinaryCompare.label">
</viewer>
<viewer
- extensions="txt"
class="org.eclipse.compare.internal.TextMergeViewerCreator"
- id="org.eclipse.compare.TextMergeViewerCreator">
+ extensions="txt"
+ id="org.eclipse.compare.TextMergeViewerCreator"
+ label="%TextCompare.label">
</viewer>
<viewer
- extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff"
class="org.eclipse.compare.internal.ImageMergeViewerCreator"
- id="org.eclipse.compare.ImageMergeViewerCreator">
+ extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff"
+ id="org.eclipse.compare.ImageMergeViewerCreator"
+ label="%ImageCompare.label">
</viewer>
<contentTypeBinding
contentTypeId="org.eclipse.core.runtime.text"

Back to the top