Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-05-07 18:09:15 +0000
committerAndre Weinand2004-05-07 18:09:15 +0000
commit30b5dc0f3cc609ab0e258c5d55f1488462e96362 (patch)
tree569421a67004ef52abe4f7c832afa2dfe0155852
parent1ff4cf5412488ecfd6d632d364c7819ea6912c82 (diff)
downloadeclipse.platform.team-30b5dc0f3cc609ab0e258c5d55f1488462e96362.tar.gz
eclipse.platform.team-30b5dc0f3cc609ab0e258c5d55f1488462e96362.tar.xz
eclipse.platform.team-30b5dc0f3cc609ab0e258c5d55f1488462e96362.zip
added 3.0 tag to schema file
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/schema/streamMergers.exsd11
-rw-r--r--bundles/org.eclipse.compare/schema/streamMergers.exsd11
2 files changed, 20 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/schema/streamMergers.exsd b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/schema/streamMergers.exsd
index c89c395ae..133ca9d40 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/schema/streamMergers.exsd
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/schema/streamMergers.exsd
@@ -8,7 +8,7 @@
<documentation>
This extension point allows a plug-in to register a stream merger
for specific content types. The stream merger is expected to perform a three-way merge
-on three input streams and write the result to an output stream.
+on three input streams and writes the result to an output stream.
The extension point must implement the interface &lt;samp&gt;org.eclipse.compare.IStreamMerger&lt;/samp&gt;.
</documentation>
</annotation>
@@ -93,6 +93,15 @@ The extension point must implement the interface &lt;samp&gt;org.eclipse.compare
<annotation>
<appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ 3.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
<meta.section type="examples"/>
</appInfo>
<documentation>
diff --git a/bundles/org.eclipse.compare/schema/streamMergers.exsd b/bundles/org.eclipse.compare/schema/streamMergers.exsd
index c89c395ae..133ca9d40 100644
--- a/bundles/org.eclipse.compare/schema/streamMergers.exsd
+++ b/bundles/org.eclipse.compare/schema/streamMergers.exsd
@@ -8,7 +8,7 @@
<documentation>
This extension point allows a plug-in to register a stream merger
for specific content types. The stream merger is expected to perform a three-way merge
-on three input streams and write the result to an output stream.
+on three input streams and writes the result to an output stream.
The extension point must implement the interface &lt;samp&gt;org.eclipse.compare.IStreamMerger&lt;/samp&gt;.
</documentation>
</annotation>
@@ -93,6 +93,15 @@ The extension point must implement the interface &lt;samp&gt;org.eclipse.compare
<annotation>
<appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ 3.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
<meta.section type="examples"/>
</appInfo>
<documentation>

Back to the top